Ticket #203: imr-kickmac-patch-r2.diff

net80211/ieee80211_ioctl.h

@@ -521 +521 @@
-#define IEEE80211_IOCTL_DELMAC          (SIOCIWFIRSTPRIV+24)
-#define IEEE80211_IOCTL_WDSADDMAC       (SIOCIWFIRSTPRIV+26)
-#define IEEE80211_IOCTL_WDSDELMAC       (SIOCIWFIRSTPRIV+28)
+#define IEEE80211_IOCTL_KICKMAC         (SIOCIWFIRSTPRIV+30)
-enum {
-        IEEE80211_WMMPARAMS_CWMIN       = 1,
-        IEEE80211_WMMPARAMS_CWMAX       = 2,

net80211/ieee80211_wireless.c

@@ -2876 +2876 @@
-        return -1;
-}
-
+/* ioctl to kick the associated station with the given mac address.
+ * Invoked via iwpriv <interface> kickmac <MAC to kick>
+ */
-static int
+ieee80211_ioctl_kickmac(struct net_device *dev, struct iw_request_info *info,
+                          void *w, char *extra)
+{
+        struct sockaddr *sa = (struct sockaddr *)extra;
+        struct ieee80211req_mlme mlme;
+        
+        if(sa->sa_family != ARPHRD_ETHER) return -EINVAL;
+
+        /* Setup a mlme request to disassociate with the given MAC */
+        mlme.im_op = IEEE80211_MLME_DISASSOC;
+        mlme.im_reason = IEEE80211_REASON_UNSPECIFIED;
+        IEEE80211_ADDR_COPY(&(mlme.im_macaddr), sa->sa_data);
+
+        /* Send off the mlme request and return the result. */
+        return ieee80211_ioctl_setmlme(dev, info, w,(char *)&mlme);
+}
+
+static int
-ieee80211_ioctl_addmac(struct net_device *dev, struct iw_request_info *info,
-                         void *w, char *extra)
-{
@@ -3504 +3525 @@
-          IW_PRIV_TYPE_ADDR | IW_PRIV_SIZE_FIXED | 1, 0,"addmac" },
-        { IEEE80211_IOCTL_DELMAC,
-          IW_PRIV_TYPE_ADDR | IW_PRIV_SIZE_FIXED | 1, 0,"delmac" },
+        { IEEE80211_IOCTL_KICKMAC,
+          IW_PRIV_TYPE_ADDR | IW_PRIV_SIZE_FIXED | 1, 0, "kickmac"},
-        { IEEE80211_IOCTL_WDSADDMAC,
-          IW_PRIV_TYPE_ADDR | IW_PRIV_SIZE_FIXED | 1, 0,"wds_add" },
-        { IEEE80211_IOCTL_WDSDELMAC,
@@ -3895 +3918 @@
-        (iw_handler) NULL,                              /* SIOCIWFIRSTPRIV+27 */
-        (iw_handler) ieee80211_ioctl_wdsdelmac,         /* SIOCIWFIRSTPRIV+28 */
-        (iw_handler) NULL,                              /* SIOCIWFIRSTPRIV+29 */
+        (iw_handler) ieee80211_ioctl_kickmac,           /* SIOCIWFIRSTPRIV+30 */
+        (iw_handler) NULL,                              /* SIOCIWFIRSTPRIV+31 */
-};
-static struct iw_handler_def ieee80211_iw_handler_def = {
-#define N(a)    (sizeof (a) / sizeof (a[0]))