Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: drivers/net/ethernet/freescale/fec_main.c drivers/net/ethernet/renesas/sh_eth.c net/ipv4/gre.c The GRE conflict is between a bug fix (kfree_skb --> kfree_skb_list) and the splitting of the gre.c code into seperate files. The FEC conflict was two sets of changes adding ethtool support code in an "!CONFIG_M5272" CPP protected block. Finally the sh_eth.c conflict was between one commit add bits set in the .eesr_err_check mask whilst another commit removed the .tx_error_check member and assignments. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@ -477,15 +477,8 @@ EXPORT_SYMBOL(skb_add_rx_frag);
|
||||
|
||||
static void skb_drop_list(struct sk_buff **listp)
|
||||
{
|
||||
struct sk_buff *list = *listp;
|
||||
|
||||
kfree_skb_list(*listp);
|
||||
*listp = NULL;
|
||||
|
||||
do {
|
||||
struct sk_buff *this = list;
|
||||
list = list->next;
|
||||
kfree_skb(this);
|
||||
} while (list);
|
||||
}
|
||||
|
||||
static inline void skb_drop_fraglist(struct sk_buff *skb)
|
||||
@ -645,6 +638,17 @@ void kfree_skb(struct sk_buff *skb)
|
||||
}
|
||||
EXPORT_SYMBOL(kfree_skb);
|
||||
|
||||
void kfree_skb_list(struct sk_buff *segs)
|
||||
{
|
||||
while (segs) {
|
||||
struct sk_buff *next = segs->next;
|
||||
|
||||
kfree_skb(segs);
|
||||
segs = next;
|
||||
}
|
||||
}
|
||||
EXPORT_SYMBOL(kfree_skb_list);
|
||||
|
||||
/**
|
||||
* skb_tx_error - report an sk_buff xmit error
|
||||
* @skb: buffer that triggered an error
|
||||
|
Reference in New Issue
Block a user