aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/skbuff.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/core/skbuff.c')
-rw-r--r--net/core/skbuff.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index f3404ae9f19..3d564686902 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -88,7 +88,7 @@ static struct kmem_cache *skbuff_fclone_cache __read_mostly;
88void skb_over_panic(struct sk_buff *skb, int sz, void *here) 88void skb_over_panic(struct sk_buff *skb, int sz, void *here)
89{ 89{
90 printk(KERN_EMERG "skb_over_panic: text:%p len:%d put:%d head:%p " 90 printk(KERN_EMERG "skb_over_panic: text:%p len:%d put:%d head:%p "
91 "data:%p tail:%p end:%p dev:%s\n", 91 "data:%p tail:%p end:%p dev:%s\n",
92 here, skb->len, sz, skb->head, skb->data, skb->tail, skb->end, 92 here, skb->len, sz, skb->head, skb->data, skb->tail, skb->end,
93 skb->dev ? skb->dev->name : "<NULL>"); 93 skb->dev ? skb->dev->name : "<NULL>");
94 BUG(); 94 BUG();
@@ -106,7 +106,7 @@ void skb_over_panic(struct sk_buff *skb, int sz, void *here)
106void skb_under_panic(struct sk_buff *skb, int sz, void *here) 106void skb_under_panic(struct sk_buff *skb, int sz, void *here)
107{ 107{
108 printk(KERN_EMERG "skb_under_panic: text:%p len:%d put:%d head:%p " 108 printk(KERN_EMERG "skb_under_panic: text:%p len:%d put:%d head:%p "
109 "data:%p tail:%p end:%p dev:%s\n", 109 "data:%p tail:%p end:%p dev:%s\n",
110 here, skb->len, sz, skb->head, skb->data, skb->tail, skb->end, 110 here, skb->len, sz, skb->head, skb->data, skb->tail, skb->end,
111 skb->dev ? skb->dev->name : "<NULL>"); 111 skb->dev ? skb->dev->name : "<NULL>");
112 BUG(); 112 BUG();
@@ -271,7 +271,7 @@ struct sk_buff *__netdev_alloc_skb(struct net_device *dev,
271 int node = dev->dev.parent ? dev_to_node(dev->dev.parent) : -1; 271 int node = dev->dev.parent ? dev_to_node(dev->dev.parent) : -1;
272 struct sk_buff *skb; 272 struct sk_buff *skb;
273 273
274 skb = __alloc_skb(length + NET_SKB_PAD, gfp_mask, 0, node); 274 skb = __alloc_skb(length + NET_SKB_PAD, gfp_mask, 0, node);
275 if (likely(skb)) { 275 if (likely(skb)) {
276 skb_reserve(skb, NET_SKB_PAD); 276 skb_reserve(skb, NET_SKB_PAD);
277 skb->dev = dev; 277 skb->dev = dev;
@@ -819,12 +819,12 @@ struct sk_buff *skb_copy_expand(const struct sk_buff *skb,
819 * 819 *
820 * May return error in out of memory cases. The skb is freed on error. 820 * May return error in out of memory cases. The skb is freed on error.
821 */ 821 */
822 822
823int skb_pad(struct sk_buff *skb, int pad) 823int skb_pad(struct sk_buff *skb, int pad)
824{ 824{
825 int err; 825 int err;
826 int ntail; 826 int ntail;
827 827
828 /* If the skbuff is non linear tailroom is always zero.. */ 828 /* If the skbuff is non linear tailroom is always zero.. */
829 if (!skb_cloned(skb) && skb_tailroom(skb) >= pad) { 829 if (!skb_cloned(skb) && skb_tailroom(skb) >= pad) {
830 memset(skb->data+skb->len, 0, pad); 830 memset(skb->data+skb->len, 0, pad);
@@ -851,8 +851,8 @@ int skb_pad(struct sk_buff *skb, int pad)
851free_skb: 851free_skb:
852 kfree_skb(skb); 852 kfree_skb(skb);
853 return err; 853 return err;
854} 854}
855 855
856/* Trims skb to length len. It can change skb pointers. 856/* Trims skb to length len. It can change skb pointers.
857 */ 857 */
858 858