diff options
| author | David S. Miller <davem@davemloft.net> | 2013-04-01 13:36:50 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-01 13:36:50 -0400 |
| commit | a210576cf891e9e6d2c238eabcf5c1286b1e7526 (patch) | |
| tree | 0fa81a901cf628b25e6ee79057700cf39e59818a /include/linux/netdevice.h | |
| parent | 7d4c04fc170087119727119074e72445f2bb192b (diff) | |
| parent | 3658f3604066d5500ebd73a04084f127dc779441 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/mac80211/sta_info.c
net/wireless/core.h
Two minor conflicts in wireless. Overlapping additions of extern
declarations in net/wireless/core.h and a bug fix overlapping with
the addition of a boolean parameter to __ieee80211_key_free().
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 4491414a9218..a302f7f01f86 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -893,7 +893,7 @@ struct netdev_fcoe_hbainfo { | |||
| 893 | * | 893 | * |
| 894 | * int (*ndo_bridge_setlink)(struct net_device *dev, struct nlmsghdr *nlh) | 894 | * int (*ndo_bridge_setlink)(struct net_device *dev, struct nlmsghdr *nlh) |
| 895 | * int (*ndo_bridge_getlink)(struct sk_buff *skb, u32 pid, u32 seq, | 895 | * int (*ndo_bridge_getlink)(struct sk_buff *skb, u32 pid, u32 seq, |
| 896 | * struct net_device *dev) | 896 | * struct net_device *dev, u32 filter_mask) |
| 897 | * | 897 | * |
| 898 | * int (*ndo_change_carrier)(struct net_device *dev, bool new_carrier); | 898 | * int (*ndo_change_carrier)(struct net_device *dev, bool new_carrier); |
| 899 | * Called to change device carrier. Soft-devices (like dummy, team, etc) | 899 | * Called to change device carrier. Soft-devices (like dummy, team, etc) |