diff options
| author | David S. Miller <davem@davemloft.net> | 2010-07-27 21:01:35 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-27 21:01:35 -0700 |
| commit | bb7e95c8fd859922c6cf3ebbb3a8546007df1748 (patch) | |
| tree | 58b54c6306ba168b76f25cc6dc9a2d1d2eb830a7 /include/linux/if_macvlan.h | |
| parent | b8bc0421ab7f83712a0a8ef7eb05fa73ec53c027 (diff) | |
| parent | 5447080cfa3c77154498dfbf225367ac85b4c2b5 (diff) | |
| download | linux-bb7e95c8fd859922c6cf3ebbb3a8546007df1748.tar.gz linux-bb7e95c8fd859922c6cf3ebbb3a8546007df1748.tar.bz2 linux-bb7e95c8fd859922c6cf3ebbb3a8546007df1748.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x_main.c
Merge bnx2x bug fixes in by hand... :-/
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/if_macvlan.h')
| -rw-r--r-- | include/linux/if_macvlan.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h index e24ce6ea1fa3..35280b302290 100644 --- a/include/linux/if_macvlan.h +++ b/include/linux/if_macvlan.h @@ -72,6 +72,8 @@ static inline void macvlan_count_rx(const struct macvlan_dev *vlan, } } +extern void macvlan_common_setup(struct net_device *dev); + extern int macvlan_common_newlink(struct net *src_net, struct net_device *dev, struct nlattr *tb[], struct nlattr *data[], int (*receive)(struct sk_buff *skb), |