lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source
This commit is contained in:
David S. Miller
2009-10-11 23:15:47 -07:00
parent 8aa0f64ac3 10c435f18b
commit 7fe13c5733
37 changed files with 464 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/netxen/netxen_nic_main.c
View File

@@ -1714,7 +1714,7 @@ netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
/* 4 fragments per cmd des */
no_of_desc = (frag_count + 3) >> 2;
if (unlikely(no_of_desc + 2) > netxen_tx_avail(tx_ring)) {
if (unlikely(no_of_desc + 2 > netxen_tx_avail(tx_ring))) {
netif_stop_queue(netdev);
return NETDEV_TX_BUSY;
}