2 files changed, 7 insertions, 2 deletions

diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index 224a74691312..ede2fa7477ac 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -149,6 +149,7 @@
 #define NX_P2_RX_JUMBO_BUF_MAX_LEN     (NX_MAX_ETHERHDR + P2_MAX_MTU)
 #define NX_P3_RX_JUMBO_BUF_MAX_LEN     (NX_MAX_ETHERHDR + P3_MAX_MTU)
 #define NX_CT_DEFAULT_RX_BUF_LEN        2048
+#define NX_LRO_BUFFER_EXTRA             2048
 
 #define NX_RX_LRO_BUFFER_LENGTH         (8060)
 
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 8d4aa6f74bff..04e36f2b1a93 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -265,6 +265,10 @@ int netxen_alloc_sw_resources(struct netxen_adapter *adapter)
                         else
                                 rds_ring->dma_size =
                                         NX_P2_RX_JUMBO_BUF_MAX_LEN;
+
+                        if (adapter->capabilities & NX_CAP0_HW_LRO)
+                                rds_ring->dma_size += NX_LRO_BUFFER_EXTRA;
+
                         rds_ring->skb_size =
                                 rds_ring->dma_size + NET_IP_ALIGN;
                         break;
@@ -1217,6 +1221,7 @@ 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);
@@ -1278,8 +1283,7 @@ netxen_process_lro(struct netxen_adapter *adapter,
 
         skb_put(skb, lro_length + data_offset);
 
-        skb->truesize = (skb->len + sizeof(struct sk_buff) +
-                        ((unsigned long)skb->data - (unsigned long)skb->head));
+        skb->truesize = skb->len + sizeof(struct sk_buff) + skb_headroom(skb);
 
         skb_pull(skb, l2_hdr_offset);
         skb->protocol = eth_type_trans(skb, netdev);