| Message ID | 1450344029-5296-2-git-send-email-janusz.dziedzic@tieto.com (mailing list archive) |
|---|---|
| State | RFC |
| Delegated to: | Kalle Valo |
| Headers | show |
On Thu, Dec 17, 2015 at 2:50 PM, Janusz Dziedzic <janusz.dziedzic@tieto.com> wrote: > > Set NEEDS_ALIGNED4_SKB hw flag. > This allow driver to save CPU and remove two memmove > from tx path. > > Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com> > --- > drivers/net/wireless/ath/ath9k/init.c | 1 + > drivers/net/wireless/ath/ath9k/xmit.c | 15 ++++++++++----- > 2 files changed, 11 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c > index 6abace6..d578a00 100644 > --- a/drivers/net/wireless/ath/ath9k/init.c > +++ b/drivers/net/wireless/ath/ath9k/init.c > @@ -831,6 +831,7 @@ static void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) > ieee80211_hw_set(hw, RX_INCLUDES_FCS); > ieee80211_hw_set(hw, HOST_BROADCAST_PS_BUFFERING); > ieee80211_hw_set(hw, SUPPORT_FAST_XMIT); > + ieee80211_hw_set(hw, NEEDS_ALIGNED4_SKBS); > > if (ath9k_ps_enable) > ieee80211_hw_set(hw, SUPPORTS_PS); > diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c > index 82fc76f..c3bd1b1 100644 > --- a/drivers/net/wireless/ath/ath9k/xmit.c > +++ b/drivers/net/wireless/ath/ath9k/xmit.c > @@ -2267,11 +2267,15 @@ static int ath_tx_prepare(struct ieee80211_hw *hw, struct sk_buff *skb, > padpos = ieee80211_hdrlen(hdr->frame_control); > padsize = padpos & 3; > if (padsize && skb->len > padpos) { > - if (skb_headroom(skb) < padsize) > - return -ENOMEM; > + if (ieee80211_hw_check(hw, NEEDS_ALIGNED4_SKBS)) { > + frmlen -= padsize; > + } else { > + if (skb_headroom(skb) < padsize) > + return -ENOMEM; > > - skb_push(skb, padsize); > - memmove(skb->data, skb->data + padsize, padpos); why the same lines has been removed and added again ? > + skb_push(skb, padsize); > + memmove(skb->data, skb->data + padsize, padpos); > + } > } > > > setup_frame_info(hw, sta, skb, frmlen); > @@ -2494,7 +2498,8 @@ static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb, > > padpos = ieee80211_hdrlen(hdr->frame_control); > padsize = padpos & 3; > - if (padsize && skb->len>padpos+padsize) { > + if (padsize && skb->len > padpos + padsize && > + !ieee80211_hw_check(sc->hw, NEEDS_ALIGNED4_SKBS)) { > /* > * Remove MAC header padding before giving the frame back to > * mac80211. > -- > 1.9.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html Regards Souptick -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On Tue, Dec 22, 2015 at 5:53 AM, Souptick Joarder <jrdr.linux@gmail.com> wrote: > On Thu, Dec 17, 2015 at 2:50 PM, Janusz Dziedzic > <janusz.dziedzic@tieto.com> wrote: >> >> Set NEEDS_ALIGNED4_SKB hw flag. >> This allow driver to save CPU and remove two memmove >> from tx path. >> >> Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com> >> --- >> drivers/net/wireless/ath/ath9k/init.c | 1 + >> drivers/net/wireless/ath/ath9k/xmit.c | 15 ++++++++++----- >> 2 files changed, 11 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c >> index 6abace6..d578a00 100644 >> --- a/drivers/net/wireless/ath/ath9k/init.c >> +++ b/drivers/net/wireless/ath/ath9k/init.c >> @@ -831,6 +831,7 @@ static void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) >> ieee80211_hw_set(hw, RX_INCLUDES_FCS); >> ieee80211_hw_set(hw, HOST_BROADCAST_PS_BUFFERING); >> ieee80211_hw_set(hw, SUPPORT_FAST_XMIT); >> + ieee80211_hw_set(hw, NEEDS_ALIGNED4_SKBS); >> >> if (ath9k_ps_enable) >> ieee80211_hw_set(hw, SUPPORTS_PS); >> diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c >> index 82fc76f..c3bd1b1 100644 >> --- a/drivers/net/wireless/ath/ath9k/xmit.c >> +++ b/drivers/net/wireless/ath/ath9k/xmit.c >> @@ -2267,11 +2267,15 @@ static int ath_tx_prepare(struct ieee80211_hw *hw, struct sk_buff *skb, >> padpos = ieee80211_hdrlen(hdr->frame_control); >> padsize = padpos & 3; >> if (padsize && skb->len > padpos) { >> - if (skb_headroom(skb) < padsize) >> - return -ENOMEM; >> + if (ieee80211_hw_check(hw, NEEDS_ALIGNED4_SKBS)) { >> + frmlen -= padsize; >> + } else { >> + if (skb_headroom(skb) < padsize) >> + return -ENOMEM; >> >> - skb_push(skb, padsize); >> - memmove(skb->data, skb->data + padsize, padpos); > > why the same lines has been removed and added again ? The indentation is different as they're now in another if statement under the if (padsize... statement. >> + skb_push(skb, padsize); >> + memmove(skb->data, skb->data + padsize, padpos); >> + } >> } > > > >> >> >> setup_frame_info(hw, sta, skb, frmlen); >> @@ -2494,7 +2498,8 @@ static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb, >> >> padpos = ieee80211_hdrlen(hdr->frame_control); >> padsize = padpos & 3; >> - if (padsize && skb->len>padpos+padsize) { >> + if (padsize && skb->len > padpos + padsize && >> + !ieee80211_hw_check(sc->hw, NEEDS_ALIGNED4_SKBS)) { >> /* >> * Remove MAC header padding before giving the frame back to >> * mac80211. >> -- >> 1.9.1 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html > > Regards > Souptick > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c index 6abace6..d578a00 100644 --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c @@ -831,6 +831,7 @@ static void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) ieee80211_hw_set(hw, RX_INCLUDES_FCS); ieee80211_hw_set(hw, HOST_BROADCAST_PS_BUFFERING); ieee80211_hw_set(hw, SUPPORT_FAST_XMIT); + ieee80211_hw_set(hw, NEEDS_ALIGNED4_SKBS); if (ath9k_ps_enable) ieee80211_hw_set(hw, SUPPORTS_PS); diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index 82fc76f..c3bd1b1 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c @@ -2267,11 +2267,15 @@ static int ath_tx_prepare(struct ieee80211_hw *hw, struct sk_buff *skb, padpos = ieee80211_hdrlen(hdr->frame_control); padsize = padpos & 3; if (padsize && skb->len > padpos) { - if (skb_headroom(skb) < padsize) - return -ENOMEM; + if (ieee80211_hw_check(hw, NEEDS_ALIGNED4_SKBS)) { + frmlen -= padsize; + } else { + if (skb_headroom(skb) < padsize) + return -ENOMEM; - skb_push(skb, padsize); - memmove(skb->data, skb->data + padsize, padpos); + skb_push(skb, padsize); + memmove(skb->data, skb->data + padsize, padpos); + } } setup_frame_info(hw, sta, skb, frmlen); @@ -2494,7 +2498,8 @@ static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb, padpos = ieee80211_hdrlen(hdr->frame_control); padsize = padpos & 3; - if (padsize && skb->len>padpos+padsize) { + if (padsize && skb->len > padpos + padsize && + !ieee80211_hw_check(sc->hw, NEEDS_ALIGNED4_SKBS)) { /* * Remove MAC header padding before giving the frame back to * mac80211.
Set NEEDS_ALIGNED4_SKB hw flag. This allow driver to save CPU and remove two memmove from tx path. Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com> --- drivers/net/wireless/ath/ath9k/init.c | 1 + drivers/net/wireless/ath/ath9k/xmit.c | 15 ++++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-)