diff --git a/[refs] b/[refs] index 87c7016613b7..eae9705a6bed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 534e7a4566ca5fd3c0c92a655bcbaa6f9bd13042 +refs/heads/master: af71ff85047b744d37872491f485f7a1e0677990 diff --git a/trunk/include/net/cfg80211.h b/trunk/include/net/cfg80211.h index 4bf101bada4e..5390e3245a1a 100644 --- a/trunk/include/net/cfg80211.h +++ b/trunk/include/net/cfg80211.h @@ -3055,6 +3055,7 @@ void cfg80211_cqm_pktloss_notify(struct net_device *dev, * @dev: network device * @bssid: BSSID of AP (to avoid races) * @replay_ctr: new replay counter + * @gfp: allocation flags */ void cfg80211_gtk_rekey_notify(struct net_device *dev, const u8 *bssid, const u8 *replay_ctr, gfp_t gfp);