summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/libertas/radiotap.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-12-06 09:23:34 +0300
committerDavid S. Miller <davem@davemloft.net>2008-12-06 09:23:34 +0300
commit098401a600b6344771900fe164c5eafb668ce99c (patch)
treec03077ee357cf6191bcd9f44ead4e6e4ce8f0495 /drivers/net/wireless/libertas/radiotap.h
parentcb7b48f671f9c7582993a6c0ff6e989078048561 (diff)
parentc112d0c5b89037dd618083b5fdf4bb36b0c51d77 (diff)
downloadlinux-098401a600b6344771900fe164c5eafb668ce99c.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/libertas/radiotap.h')
-rw-r--r--drivers/net/wireless/libertas/radiotap.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/wireless/libertas/radiotap.h b/drivers/net/wireless/libertas/radiotap.h
index 5d118f40cfbc..f8eb9097ff0a 100644
--- a/drivers/net/wireless/libertas/radiotap.h
+++ b/drivers/net/wireless/libertas/radiotap.h
@@ -6,9 +6,6 @@ struct tx_radiotap_hdr {
u8 txpower;
u8 rts_retries;
u8 data_retries;
-#if 0
- u8 pad[IEEE80211_RADIOTAP_HDRLEN - 12];
-#endif
} __attribute__ ((packed));
#define TX_RADIOTAP_PRESENT ( \