Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

[linux] / net / ethernet / eth.c

diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index ee28440..fd8faa0 100644 (file)
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -427,13 +427,13 @@ ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len)
 }
 EXPORT_SYMBOL(sysfs_format_mac);
 
-struct sk_buff **eth_gro_receive(struct sk_buff **head,
-                                struct sk_buff *skb)
+struct sk_buff *eth_gro_receive(struct list_head *head, struct sk_buff *skb)
 {
-       struct sk_buff *p, **pp = NULL;
-       struct ethhdr *eh, *eh2;
-       unsigned int hlen, off_eth;
        const struct packet_offload *ptype;
+       unsigned int hlen, off_eth;
+       struct sk_buff *pp = NULL;
+       struct ethhdr *eh, *eh2;
+       struct sk_buff *p;
        __be16 type;
        int flush = 1;
 
@@ -448,7 +448,7 @@ struct sk_buff **eth_gro_receive(struct sk_buff **head,
 
        flush = 0;
 
-       for (p = *head; p; p = p->next) {
+       list_for_each_entry(p, head, list) {
                if (!NAPI_GRO_CB(p)->same_flow)
                        continue;