diff --git a/[refs] b/[refs] index f7636cf0b474..8c64fcc88fa7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4033fefab3e35e4fab5fc8b86f90f5da8e2265c9 +refs/heads/master: 849d908ec331cf9647e81adf218b844473eac673 diff --git a/trunk/drivers/staging/wlan-ng/p80211ioctl.h b/trunk/drivers/staging/wlan-ng/p80211ioctl.h index 7b0f3e09c0ba..10e11358ada2 100644 --- a/trunk/drivers/staging/wlan-ng/p80211ioctl.h +++ b/trunk/drivers/staging/wlan-ng/p80211ioctl.h @@ -78,18 +78,6 @@ #define P80211_IOCTL_MAGIC (0x4a2d464dUL) -/*----------------------------------------------------------------*/ -/* Netlink protocol numbers for the indication interface */ - -#define P80211_NL_SOCK_IND NETLINK_USERSOCK - -/*----------------------------------------------------------------*/ -/* Netlink multicast bits for different types of messages */ - -#define P80211_NL_MCAST_GRP_MLME BIT(0) /* Local station messages */ -#define P80211_NL_MCAST_GRP_SNIFF BIT(1) /* Sniffer messages */ -#define P80211_NL_MCAST_GRP_DIST BIT(2) /* Distribution system messages */ - /*================================================================*/ /* Types */ @@ -107,13 +95,4 @@ typedef struct p80211ioctl_req u32 result; } __attribute__((packed)) p80211ioctl_req_t; - -/*================================================================*/ -/* Extern Declarations */ - - -/*================================================================*/ -/* Function Declarations */ - - #endif /* _P80211IOCTL_H */