diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-21 22:57:10 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-21 22:57:10 -0500 |
| commit | c2da953a46b18b7515ad476c1c1686640a12e93a (patch) | |
| tree | b384f097718119e715cdebd74710ddceeb80fdc8 /drivers/net/wireless/iwlwifi/iwl-3945.c | |
| parent | c94cb314503a69492bf4455dce4f6d300cff0851 (diff) | |
| parent | 9cf7f247bd0cd21e475c71a4e018bb612ef02aab (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-3945.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c index d0c9bdcf393a..8fdb34222c0a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c | |||
| @@ -2482,7 +2482,6 @@ unsigned int iwl3945_hw_get_beacon_cmd(struct iwl3945_priv *priv, | |||
| 2482 | 2482 | ||
| 2483 | frame_size = iwl3945_fill_beacon_frame(priv, | 2483 | frame_size = iwl3945_fill_beacon_frame(priv, |
| 2484 | tx_beacon_cmd->frame, | 2484 | tx_beacon_cmd->frame, |
| 2485 | iwl3945_broadcast_addr, | ||
| 2486 | sizeof(frame->u) - sizeof(*tx_beacon_cmd)); | 2485 | sizeof(frame->u) - sizeof(*tx_beacon_cmd)); |
| 2487 | 2486 | ||
| 2488 | BUG_ON(frame_size > MAX_MPDU_SIZE); | 2487 | BUG_ON(frame_size > MAX_MPDU_SIZE); |