aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-11-19 13:13:47 -0800
committerDavid S. Miller <davem@davemloft.net>2010-11-19 13:13:47 -0800
commit24912420e923d56461b400d83f250a31bed8a964 (patch)
tree3bb599e665ed7510df2e3f4c8cb008f7a33f50a9 /include
parent0670b8ae66daf1d326c7bd10e73daff5f18fcf92 (diff)
parent0302b8622ce696af1cda22fcf207d3793350e896 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/bonding/bond_main.c net/core/net-sysfs.c net/ipv6/addrconf.c
Diffstat (limited to 'include')
-rw-r--r--include/linux/rtnetlink.h2
-rw-r--r--include/net/cfg80211.h2
-rw-r--r--include/net/neighbour.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index d42f274418b..bbad657a372 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -6,7 +6,6 @@
#include <linux/if_link.h>
#include <linux/if_addr.h>
#include <linux/neighbour.h>
-#include <linux/netdevice.h>
/* rtnetlink families. Values up to 127 are reserved for real address
* families, values above 128 may be used arbitrarily.
@@ -606,6 +605,7 @@ struct tcamsg {
#ifdef __KERNEL__
#include <linux/mutex.h>
+#include <linux/netdevice.h>
static __inline__ int rtattr_strcmp(const struct rtattr *rta, const char *str)
{
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index e5702f5ac57..772dea243e5 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1356,7 +1356,7 @@ enum wiphy_flags {
WIPHY_FLAG_4ADDR_AP = BIT(5),
WIPHY_FLAG_4ADDR_STATION = BIT(6),
WIPHY_FLAG_CONTROL_PORT_PROTOCOL = BIT(7),
- WIPHY_FLAG_IBSS_RSN = BIT(7),
+ WIPHY_FLAG_IBSS_RSN = BIT(8),
};
struct mac_address {
diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 815b2ce9f4a..4014b623880 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -303,7 +303,7 @@ static inline void neigh_confirm(struct neighbour *neigh)
static inline int neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
{
- unsigned long now = ACCESS_ONCE(jiffies);
+ unsigned long now = jiffies;
if (neigh->used != now)
neigh->used = now;