diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 11:46:28 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 11:46:28 -0700 |
commit | 3a7029d822d3aef4502269dae5fe8fbb83672bc5 (patch) | |
tree | 0d9f5152035cbeeb7ae4372dbb808d6cdcc6ae87 /include | |
parent | 4ac08d36aa9c556556c7b150caee263c6d542645 (diff) | |
parent | 48e5ecae691cfb50aa39036ba9fc193f5c24dbb3 (diff) | |
download | kernel_samsung_tuna-3a7029d822d3aef4502269dae5fe8fbb83672bc5.zip kernel_samsung_tuna-3a7029d822d3aef4502269dae5fe8fbb83672bc5.tar.gz kernel_samsung_tuna-3a7029d822d3aef4502269dae5fe8fbb83672bc5.tar.bz2 |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
amd8111e: Fix rx return code
pktgen: fix multiple queue warning
mac80211.h: fix kernel-doc excesses
p54: fix build warnings
ath5k: Reset key cache on interface up, thus fixing resume
mac80211: correct warnings in minstrel rate control algorithm
RFKILL: fix input layer initialisation
p54: fix misbehavings when firmware can't be found
dm9601: runtime mac address change support
via-velocity: use driver string instead of dev->name before register_netdev()
drivers/net/wan/syncppp: Fix unused-var warnings
mlx4: Setting the correct offset for default mac address
mlx4_en: remove duplicated #include
ibm_newemac: Fix typo in flow control config option
ehea: Detect 16GB hugepages for firmware restriction
dmfe: check pci_alloc_consistent errors
qeth: avoid skb_under_panic for malformatted inbound data
qeth: remove unnecessary support ckeck in sysfs route6
qeth: fix offset error in non prealloc header path
qeth: remove non-recover-thread checkings
Diffstat (limited to 'include')
-rw-r--r-- | include/net/mac80211.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index d861197..8856e2d 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -1474,7 +1474,6 @@ void ieee80211_tx_status_irqsafe(struct ieee80211_hw *hw, * ieee80211_beacon_get - beacon generation function * @hw: pointer obtained from ieee80211_alloc_hw(). * @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf. - * @control: will be filled with information needed to send this beacon. * * If the beacon frames are generated by the host system (i.e., not in * hardware/firmware), the low-level driver uses this function to receive @@ -1575,7 +1574,6 @@ __le16 ieee80211_generic_frame_duration(struct ieee80211_hw *hw, * ieee80211_get_buffered_bc - accessing buffered broadcast and multicast frames * @hw: pointer as obtained from ieee80211_alloc_hw(). * @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf. - * @control: will be filled with information needed to send returned frame. * * Function for accessing buffered broadcast and multicast frames. If * hardware/firmware does not implement buffering of broadcast/multicast @@ -1623,9 +1621,8 @@ unsigned int ieee80211_hdrlen(__le16 fc); * * @keyconf: the parameter passed with the set key * @skb: the skb for which the key is needed - * @rc4key: a buffer to which the key will be written * @type: TBD - * @key: TBD + * @key: a buffer to which the key will be written */ void ieee80211_get_tkip_key(struct ieee80211_key_conf *keyconf, struct sk_buff *skb, @@ -1726,7 +1723,8 @@ void ieee80211_iterate_active_interfaces_atomic(struct ieee80211_hw *hw, * @hw: pointer as obtained from ieee80211_alloc_hw(). * @ra: receiver address of the BA session recipient * @tid: the TID to BA on. - * @return: success if addBA request was sent, failure otherwise + * + * Return: success if addBA request was sent, failure otherwise * * Although mac80211/low level driver/user space application can estimate * the need to start aggregation on a certain RA/TID, the session level @@ -1764,7 +1762,8 @@ void ieee80211_start_tx_ba_cb_irqsafe(struct ieee80211_hw *hw, const u8 *ra, * @ra: receiver address of the BA session recipient * @tid: the TID to stop BA. * @initiator: if indicates initiator DELBA frame will be sent. - * @return: error if no sta with matching da found, success otherwise + * + * Return: error if no sta with matching da found, success otherwise * * Although mac80211/low level driver/user space application can estimate * the need to stop aggregation on a certain RA/TID, the session level |