diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-01-07 22:44:56 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-01-07 22:44:56 -0500 |
| commit | 11897539a967059a817175ea57ad586a1faadd80 (patch) | |
| tree | 67dfb1a5608a9439d0d263dde37be27eee1ad83b /drivers/net | |
| parent | 80b02e595c308a5deb2ad49bd6aa3ab1da9cdbdb (diff) | |
| parent | fe5f8e2a1c5c040209c598a28e19c55f30e1040d (diff) | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/ipw2100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c index 0e94fbbf7a94..b85857a84870 100644 --- a/drivers/net/wireless/ipw2100.c +++ b/drivers/net/wireless/ipw2100.c | |||
| @@ -2664,7 +2664,7 @@ static void __ipw2100_rx_process(struct ipw2100_priv *priv) | |||
| 2664 | break; | 2664 | break; |
| 2665 | } | 2665 | } |
| 2666 | #endif | 2666 | #endif |
| 2667 | if (stats.len < sizeof(u->rx_data.header)) | 2667 | if (stats.len < sizeof(struct ieee80211_hdr_3addr)) |
| 2668 | break; | 2668 | break; |
| 2669 | switch (WLAN_FC_GET_TYPE(u->rx_data.header.frame_ctl)) { | 2669 | switch (WLAN_FC_GET_TYPE(u->rx_data.header.frame_ctl)) { |
| 2670 | case IEEE80211_FTYPE_MGMT: | 2670 | case IEEE80211_FTYPE_MGMT: |