netxen: fix byte-swapping in tx and rx
Here's the reworked patch. This cleans up some unnecessary byte-swapping while setting up tx and interpreting rx desc. The 64 bit rx status data should be converted to host endian format only once and the macros just need to extract bitfields. This saves a spate of interrupts on pseries blades caused by buggy (non) processing rx status ring. Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
committed by
Jeff Garzik
parent
53a01e00f8
commit
5dc162682d
@ -1070,16 +1070,17 @@ netxen_process_rcv(struct netxen_adapter *adapter, int ctxid,
|
||||
{
|
||||
struct pci_dev *pdev = adapter->pdev;
|
||||
struct net_device *netdev = adapter->netdev;
|
||||
int index = netxen_get_sts_refhandle(desc);
|
||||
u64 sts_data = le64_to_cpu(desc->status_desc_data);
|
||||
int index = netxen_get_sts_refhandle(sts_data);
|
||||
struct netxen_recv_context *recv_ctx = &(adapter->recv_ctx[ctxid]);
|
||||
struct netxen_rx_buffer *buffer;
|
||||
struct sk_buff *skb;
|
||||
u32 length = netxen_get_sts_totallength(desc);
|
||||
u32 length = netxen_get_sts_totallength(sts_data);
|
||||
u32 desc_ctx;
|
||||
struct netxen_rcv_desc_ctx *rcv_desc;
|
||||
int ret;
|
||||
|
||||
desc_ctx = netxen_get_sts_type(desc);
|
||||
desc_ctx = netxen_get_sts_type(sts_data);
|
||||
if (unlikely(desc_ctx >= NUM_RCV_DESC_RINGS)) {
|
||||
printk("%s: %s Bad Rcv descriptor ring\n",
|
||||
netxen_nic_driver_name, netdev->name);
|
||||
@ -1119,7 +1120,7 @@ netxen_process_rcv(struct netxen_adapter *adapter, int ctxid,
|
||||
skb = (struct sk_buff *)buffer->skb;
|
||||
|
||||
if (likely(adapter->rx_csum &&
|
||||
netxen_get_sts_status(desc) == STATUS_CKSUM_OK)) {
|
||||
netxen_get_sts_status(sts_data) == STATUS_CKSUM_OK)) {
|
||||
adapter->stats.csummed++;
|
||||
skb->ip_summed = CHECKSUM_UNNECESSARY;
|
||||
} else
|
||||
@ -1209,7 +1210,6 @@ u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctxid, int max)
|
||||
break;
|
||||
}
|
||||
netxen_process_rcv(adapter, ctxid, desc);
|
||||
netxen_clear_sts_owner(desc);
|
||||
netxen_set_sts_owner(desc, STATUS_OWNER_PHANTOM);
|
||||
consumer = (consumer + 1) & (adapter->max_rx_desc_count - 1);
|
||||
count++;
|
||||
|
Reference in New Issue
Block a user