diff --git a/[refs] b/[refs] index 30fc6a6bafba..e430877c6048 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b6e66182dab42c42bdac72633dbe35b3dba8f69 +refs/heads/master: cd58950a5345f006a318f178705b9250aa54425c diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h index cf42f194616e..38501d20650c 100644 --- a/trunk/include/linux/skbuff.h +++ b/trunk/include/linux/skbuff.h @@ -470,7 +470,6 @@ extern int skb_cow_data(struct sk_buff *skb, int tailbits, struct sk_buff **trailer); extern int skb_pad(struct sk_buff *skb, int pad); #define dev_kfree_skb(a) consume_skb(a) -#define dev_consume_skb(a) kfree_skb_clean(a) extern void skb_over_panic(struct sk_buff *skb, int len, void *here); extern void skb_under_panic(struct sk_buff *skb, int len,