| Message ID | 20100205154452.91230c09.sfr@canb.auug.org.au |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
diff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h index 51f1512..f9cb9ba 100644 --- a/include/linux/if_macvlan.h +++ b/include/linux/if_macvlan.h @@ -30,7 +30,7 @@ struct macvlan_dev { struct hlist_node hlist; struct macvlan_port *port; struct net_device *lowerdev; - struct macvlan_rx_stats *rx_stats; + struct macvlan_rx_stats __percpu *rx_stats; enum macvlan_mode mode; int (*receive)(struct sk_buff *skb); int (*forward)(struct net_device *dev, struct sk_buff *skb);
Hi all, Today's linux-next merge of the percpu tree got a conflict in drivers/net/macvlan.c between commit fc0663d6b5e6d8e9b57f872a644c0aafd82361b7 ("macvlan: allow multiple driver backends") from the net tree and commit e20b68160144bcacbde008b9cf7df4e1544b2507 ("percpu: add __percpu sparse annotations to net drivers") from the percpu tree. The struct that is being modified by the latter commit has been moved by the former into include/linux/if_macvlan.h. I fixed it up (see below) and can carry the fix as necessary.