1. 11 Jun, 2015 36 commits
  2. 10 Jun, 2015 4 commits
    • Johannes Berg's avatar
      mac80211: convert HW flags to unsigned long bitmap · 30686bf7
      Johannes Berg authored
      As we're running out of hardware capability flags pretty quickly,
      convert them to use the regular test_bit() style unsigned long
      bitmaps.
      
      This introduces a number of helper functions/macros to set and to
      test the bits, along with new debugfs code.
      
      The occurrences of an explicit __clear_bit() are intentional, the
      drivers were never supposed to change their supported bits on the
      fly. We should investigate changing this to be a per-frame flag.
      Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
      30686bf7
    • Johannes Berg's avatar
      Merge remote-tracking branch 'net-next/master' into mac80211-next · 206c59d1
      Johannes Berg authored
      Merge back net-next to get wireless driver changes (from Kalle)
      to be able to create the API change across all trees properly.
      Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
      206c59d1
    • Alexis Green's avatar
      mac80211: Fix a case of incorrect metric used when forwarding a PREQ · 5ec596c4
      Alexis Green authored
      This patch fixes a bug in hwmp_preq_frame_process where the wrong metric
      can be used when forwarding a PREQ. This happens because the code uses
      the same metric variable to record the value of the metric to the source
      of the PREQ and the value of the metric to the target of the PREQ.
      
      This comes into play when both reply and forward are set which happens
      when IEEE80211_PREQ_PROACTIVE_PREP_FLAG is set and when MP_F_DO | MP_F_RF
      is set. The original code had a special case to handle the first case
      but not the second.
      
      The patch uses distinct variables for the two metrics which makes the
      code flow much clearer and removes the need to restore the original
      value of metric when forwarding.
      Signed-off-by: default avatarAlexis Green <agreen@cococorp.com>
      CC: Jesse Jones <jjones@cococorp.com>
      Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
      5ec596c4
    • David S. Miller's avatar
      Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge · c3eee1fb
      David S. Miller authored
      Antonio Quartulli says:
      
      ====================
      Included changes:
      - use common Jenkins hash instead of private implementation
      - extend internal routing API
      - properly re-arrange header files inclusion
      - clarify precedence between '&' and '?'
      - remove unused ethhdr variable in batadv_gw_dhcp_recipient_get()
      - ensure per-VLAN structs are updated upon MAC change
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c3eee1fb