diff options
| author | kaf24@labyrinth.cl.cam.ac.uk <kaf24@labyrinth.cl.cam.ac.uk> | 2003-02-26 15:57:33 +0000 |
|---|---|---|
| committer | kaf24@labyrinth.cl.cam.ac.uk <kaf24@labyrinth.cl.cam.ac.uk> | 2003-02-26 15:57:33 +0000 |
| commit | 52c54dcbd1108d1b7e1b36b14a00be9766d06dfe (patch) | |
| tree | 5422d34fd804c77808d2cde361f9e3ca54d8086a /xenolinux-2.4.21-pre4-sparse | |
| parent | 20989dbdb2adad8912e687ed18f5fe32c2770d86 (diff) | |
| download | xen-52c54dcbd1108d1b7e1b36b14a00be9766d06dfe.tar.gz xen-52c54dcbd1108d1b7e1b36b14a00be9766d06dfe.tar.bz2 xen-52c54dcbd1108d1b7e1b36b14a00be9766d06dfe.zip | |
bitkeeper revision 1.103 (3e5ce3edCqQ1qazfrrTapwLSJfBo_Q)
network.c, dev.c:
A few more network cleanups.
Diffstat (limited to 'xenolinux-2.4.21-pre4-sparse')
| -rw-r--r-- | xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/network/network.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/network/network.c b/xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/network/network.c index 4c4ace1006..8e742007cf 100644 --- a/xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/network/network.c +++ b/xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/network/network.c @@ -220,7 +220,7 @@ static void network_free_rx_buffers(struct net_device *dev) for ( i = np->rx_idx; i != np->net_ring->rx_prod; i = RX_RING_INC(i) ) { skb = np->rx_skb_ring[i]; - dev_kfree_skb(skb); + dev_kfree_skb_any(skb); } } @@ -228,10 +228,10 @@ static int network_start_xmit(struct sk_buff *skb, struct net_device *dev) { unsigned int i; struct net_private *np = (struct net_private *)dev->priv; - + if ( np->tx_full ) { - printk(KERN_WARNING "%s: full queue wasn't stopped!\n", dev->name); + printk(KERN_ALERT "%s: full queue wasn't stopped!\n", dev->name); netif_stop_queue(dev); return -ENOBUFS; } @@ -239,10 +239,11 @@ static int network_start_xmit(struct sk_buff *skb, struct net_device *dev) if ( (((unsigned long)skb->data & ~PAGE_MASK) + skb->len) >= PAGE_SIZE ) { - struct sk_buff *new_skb = alloc_skb(RX_BUF_SIZE, GFP_KERNEL); + struct sk_buff *new_skb = dev_alloc_skb(RX_BUF_SIZE); + if ( new_skb == NULL ) return 1; skb_put(new_skb, skb->len); memcpy(new_skb->data, skb->data, skb->len); - kfree_skb(skb); + dev_kfree_skb(skb); skb = new_skb; } |