package/acx-mac80211/patches/001-if_init_conf_removal.patch

   1 Index: acx-mac80211-20100302/acx_func.h
   2 ===================================================================
   3 --- acx-mac80211-20100302.orig/acx_func.h       2010-03-06 12:57:25.000000000 +0100
   4 +++ acx-mac80211-20100302/acx_func.h    2010-03-06 12:58:10.000000000 +0100
   5 @@ -704,9 +704,9 @@
   6  void acx_free_modes(acx_device_t *adev);
   7  int acx_i_op_tx(struct ieee80211_hw *ieee,     struct sk_buff *skb);
   8  int acx_e_op_add_interface(struct ieee80211_hw* ieee,
   9 -               struct ieee80211_if_init_conf *conf);
  10 +               struct ieee80211_vif *vif);
  11  void acx_e_op_remove_interface(struct ieee80211_hw* ieee,
  12 -               struct ieee80211_if_init_conf *conf);
  13 +               struct ieee80211_vif *vif);
  14  int acx_net_reset(struct ieee80211_hw *ieee);
  15  int acx_e_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
  16                 struct ieee80211_vif *vif, struct ieee80211_sta *sta,
  17 Index: acx-mac80211-20100302/common.c
  18 ===================================================================
  19 --- acx-mac80211-20100302.orig/common.c 2010-03-06 12:57:31.000000000 +0100
  20 +++ acx-mac80211-20100302/common.c      2010-03-06 12:59:51.000000000 +0100
  21 @@ -4402,7 +4402,7 @@
  22  }
  23
  24  int acx_e_op_add_interface(struct ieee80211_hw *ieee,
  25 -                     struct ieee80211_if_init_conf *conf)
  26 +                     struct ieee80211_vif *vif)
  27  {
  28         acx_device_t *adev = ieee2adev(ieee);
  29         unsigned long flags;
  30 @@ -4414,14 +4414,14 @@
  31         acx_sem_lock(adev);
  32         acx_lock(adev, flags);
  33
  34 -       if (conf->type == NL80211_IFTYPE_MONITOR) {
  35 +       if (vif->type == NL80211_IFTYPE_MONITOR) {
  36                 adev->interface.monitor++;
  37         } else {
  38                 if (adev->interface.operating)
  39                         goto out_unlock;
  40                 adev->interface.operating = 1;
  41 -               adev->interface.mac_addr = conf->mac_addr;
  42 -               adev->interface.type = conf->type;
  43 +               adev->interface.mac_addr = vif->addr;
  44 +               adev->interface.type = vif->type;
  45         }
  46  //     adev->mode = conf->type;
  47
  48 @@ -4436,8 +4436,8 @@
  49
  50         printk(KERN_INFO "acx: Virtual interface added "
  51                "(type: 0x%08X, MAC: %s)\n",
  52 -              conf->type,
  53 -              acx_print_mac(mac, conf->mac_addr));
  54 +              vif->type,
  55 +              acx_print_mac(mac, vif->addr));
  56
  57      out_unlock:
  58         acx_unlock(adev, flags);
  59 @@ -4448,7 +4448,7 @@
  60  }
  61
  62  void acx_e_op_remove_interface(struct ieee80211_hw *hw,
  63 -                         struct ieee80211_if_init_conf *conf)
  64 +                         struct ieee80211_vif *vif)
  65  {
  66         acx_device_t *adev = ieee2adev(hw);
  67
  68 @@ -4457,23 +4457,23 @@
  69         FN_ENTER;
  70         acx_sem_lock(adev);
  71
  72 -       if (conf->type == NL80211_IFTYPE_MONITOR) {
  73 +       if (vif->type == NL80211_IFTYPE_MONITOR) {
  74                 adev->interface.monitor--;
  75  //      assert(bcm->interface.monitor >= 0);
  76         } else {
  77                 adev->interface.operating = 0;
  78         }
  79
  80 -       log(L_DEBUG, "acx: %s: interface.operating=%d, conf->type=%d\n",
  81 +       log(L_DEBUG, "acx: %s: interface.operating=%d, vif->type=%d\n",
  82                         __func__,
  83 -                       adev->interface.operating, conf->type);
  84 +                       adev->interface.operating, vif->type);
  85
  86         if (adev->initialized)
  87                 acx_s_select_opmode(adev);
  88
  89         log(L_ANY, "acx: Virtual interface removed: "
  90                "type=%d, MAC=%s\n",
  91 -              conf->type, acx_print_mac(mac, conf->mac_addr));
  92 +              vif->type, acx_print_mac(mac, vif->addr));
  93
  94         acx_sem_unlock(adev);
  95