diff options
| author | Russell King <[email protected]> | 2010-10-04 21:23:26 +0000 |
|---|---|---|
| committer | Russell King <[email protected]> | 2010-10-04 21:23:30 +0000 |
| commit | a9fda02bfc91a281cd812ae15dabe6bfb9574f90 (patch) | |
| tree | d7be703f341870f15f87a59a63976f650078b4d6 /drivers/net/netxen/netxen_nic_init.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/l... (diff) | |
| parent | ARM: add a vma entry for the user accessible vector page (diff) | |
| download | kernel-a9fda02bfc91a281cd812ae15dabe6bfb9574f90.tar.gz kernel-a9fda02bfc91a281cd812ae15dabe6bfb9574f90.zip | |
Merge branch 'for_rmk' of git://git.linaro.org/kernel/linux-linaro-next into devel-stable
Diffstat (limited to 'drivers/net/netxen/netxen_nic_init.c')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_init.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c index cabae7bb1fc6..b075a35b85d4 100644 --- a/drivers/net/netxen/netxen_nic_init.c +++ b/drivers/net/netxen/netxen_nic_init.c @@ -1540,7 +1540,6 @@ netxen_process_rcv(struct netxen_adapter *adapter, if (pkt_offset) skb_pull(skb, pkt_offset); - skb->truesize = skb->len + sizeof(struct sk_buff); skb->protocol = eth_type_trans(skb, netdev); napi_gro_receive(&sds_ring->napi, skb); @@ -1602,8 +1601,6 @@ netxen_process_lro(struct netxen_adapter *adapter, skb_put(skb, lro_length + data_offset); - skb->truesize = skb->len + sizeof(struct sk_buff) + skb_headroom(skb); - skb_pull(skb, l2_hdr_offset); skb->protocol = eth_type_trans(skb, netdev); |