diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-04-12 20:25:14 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-12 20:41:59 +0200 |
| commit | 7eab0f64a9eba5405222fdef0ede2468bf495efd (patch) | |
| tree | ec99640b8d0b12adbfacb85c27683125debd14f2 /drivers/net/wireless/ipw2x00/ipw2100.h | |
| parent | team: add missed "statics" (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| download | linux-7eab0f64a9eba5405222fdef0ede2468bf495efd.tar.xz linux-7eab0f64a9eba5405222fdef0ede2468bf495efd.zip | |
Merge branch 'master' into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/iwl-testmode.c
net/wireless/nl80211.c
Diffstat (limited to 'drivers/net/wireless/ipw2x00/ipw2100.h')
| -rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2100.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.h b/drivers/net/wireless/ipw2x00/ipw2100.h index e5b1c77ae0eb..973125242490 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.h +++ b/drivers/net/wireless/ipw2x00/ipw2100.h @@ -135,15 +135,6 @@ enum { IPW_HW_STATE_ENABLED = 0 }; -struct ssid_context { - char ssid[IW_ESSID_MAX_SIZE + 1]; - int ssid_len; - unsigned char bssid[ETH_ALEN]; - int port_type; - int channel; - -}; - extern const char *port_type_str[]; extern const char *band_str[]; |