diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 12:53:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 12:53:51 -0700 |
| commit | 0e10b33a05fd57a8aaf9672e05e83937fb243a08 (patch) | |
| tree | a8d8551e84a72b2f696b6d1f6112babb27d441ee /drivers/net/wireless/p54 | |
| parent | b42282e5a05018ecdc0d63a4ad530b0999785912 (diff) | |
| parent | 4a39e781682828c1b81a839e7d343fd91945a8d5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/p54')
| -rw-r--r-- | drivers/net/wireless/p54/txrx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/p54/txrx.c b/drivers/net/wireless/p54/txrx.c index 7834c26c295..042842e704d 100644 --- a/drivers/net/wireless/p54/txrx.c +++ b/drivers/net/wireless/p54/txrx.c @@ -703,7 +703,7 @@ void p54_tx_80211(struct ieee80211_hw *dev, struct sk_buff *skb) struct p54_tx_info *p54info; struct p54_hdr *hdr; struct p54_tx_data *txhdr; - unsigned int padding, len, extra_len; + unsigned int padding, len, extra_len = 0; int i, j, ridx; u16 hdr_flags = 0, aid = 0; u8 rate, queue = 0, crypt_offset = 0; |