rtl8188eu: CONFIG_SKB_COPY is alway selected

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-18 12:10:12 -05:00
parent baf9862596
commit e1633b3914
2 changed files with 4 additions and 15 deletions

View file

@ -2173,33 +2173,24 @@ static int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe)
a_len -= ETH_HLEN; a_len -= ETH_HLEN;
/* Allocate new skb for releasing to upper layer */ /* Allocate new skb for releasing to upper layer */
#ifdef CONFIG_SKB_COPY
sub_skb = dev_alloc_skb(nSubframe_Length + 12); sub_skb = dev_alloc_skb(nSubframe_Length + 12);
if (sub_skb) if (sub_skb) {
{
skb_reserve(sub_skb, 12); skb_reserve(sub_skb, 12);
data_ptr = (u8 *)skb_put(sub_skb, nSubframe_Length); data_ptr = (u8 *)skb_put(sub_skb, nSubframe_Length);
_rtw_memcpy(data_ptr, pdata, nSubframe_Length); _rtw_memcpy(data_ptr, pdata, nSubframe_Length);
} } else {
else
#endif /* CONFIG_SKB_COPY */
{
sub_skb = skb_clone(prframe->u.hdr.pkt, GFP_ATOMIC); sub_skb = skb_clone(prframe->u.hdr.pkt, GFP_ATOMIC);
if (sub_skb) if (sub_skb) {
{
sub_skb->data = pdata; sub_skb->data = pdata;
sub_skb->len = nSubframe_Length; sub_skb->len = nSubframe_Length;
skb_set_tail_pointer(sub_skb, nSubframe_Length); skb_set_tail_pointer(sub_skb, nSubframe_Length);
} } else {
else
{
DBG_88E("skb_clone() Fail!!! , nr_subframes = %d\n",nr_subframes); DBG_88E("skb_clone() Fail!!! , nr_subframes = %d\n",nr_subframes);
break; break;
} }
} }
/* sub_skb->dev = padapter->pnetdev; */
subframes[nr_subframes++] = sub_skb; subframes[nr_subframes++] = sub_skb;
if (nr_subframes >= MAX_SUBFRAME_COUNT) { if (nr_subframes >= MAX_SUBFRAME_COUNT) {

View file

@ -97,8 +97,6 @@
#define CONFIG_P2P_PS #define CONFIG_P2P_PS
#endif #endif
#define CONFIG_SKB_COPY //for amsdu
#define RTW_NOTCH_FILTER 0 /* 0:Disable, 1:Enable, */ #define RTW_NOTCH_FILTER 0 /* 0:Disable, 1:Enable, */
#define CONFIG_BR_EXT_BRNAME "br0" #define CONFIG_BR_EXT_BRNAME "br0"