--- drivers/net/netxen/netxen_nic_init.c

+++ drivers/net/netxen/netxen_nic_init.c

@@ -673,7 +673,10 @@ netxen_need_fw_reset(struct netxen_adapt

}

static char *fw_name[] = {

- "nxromimg.bin", "nx3fwct.bin", "nx3fwmn.bin", "flash",

+ NX_P2_MN_ROMIMAGE_NAME,

+ NX_P3_CT_ROMIMAGE_NAME,

+ NX_P3_MN_ROMIMAGE_NAME,

+ NX_FLASH_ROMIMAGE_NAME,

};

int

@@ -1199,7 +1202,6 @@ netxen_process_rcv(struct netxen_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);

@@ -1261,8 +1263,6 @@ netxen_process_lro(struct netxen_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);