Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 221955
b: refs/heads/master
c: 22b4dc5
h: refs/heads/master
i:
  221953: 308e871
  221951: 2e74198
v: v3
  • Loading branch information
Hauke Mehrtens authored and Greg Kroah-Hartman committed Nov 9, 2010
1 parent 72f1f11 commit e68a4df
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 32a0fdf27c7d3742c179d84c512fb9a3432e235f
refs/heads/master: 22b4dc5917a2644001e449b238ac18fb182b27fc
7 changes: 4 additions & 3 deletions trunk/drivers/staging/ath6kl/os/linux/cfg80211.c
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,7 @@ ar6k_cfg80211_scanComplete_event(AR_SOFTC_T *ar, A_STATUS status)

static int
ar6k_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,
A_UINT8 key_index, const A_UINT8 *mac_addr,
A_UINT8 key_index, bool pairwise, const A_UINT8 *mac_addr,
struct key_params *params)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev);
Expand Down Expand Up @@ -901,7 +901,7 @@ ar6k_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,

static int
ar6k_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev,
A_UINT8 key_index, const A_UINT8 *mac_addr)
A_UINT8 key_index, bool pairwise, const A_UINT8 *mac_addr)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev);

Expand Down Expand Up @@ -936,7 +936,8 @@ ar6k_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev,

static int
ar6k_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev,
A_UINT8 key_index, const A_UINT8 *mac_addr, void *cookie,
A_UINT8 key_index, bool pairwise, const A_UINT8 *mac_addr,
void *cookie,
void (*callback)(void *cookie, struct key_params*))
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev);
Expand Down

0 comments on commit e68a4df

Please sign in to comment.