diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-04 08:14:54 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-04 08:14:54 -0800 |
| commit | b02957d58a27525499ab10d272d3b44682a7ae50 (patch) | |
| tree | a220aaf44026a8be815320b3c91f1db43bbf1e2c /drivers/staging/wlan-ng/p80211conv.c | |
| parent | 3a8954e8f22cf31791d8c524c2839433e39f9368 (diff) | |
| parent | b94c765ac31f8eb9c6fe895ba611bb446b799635 (diff) | |
| download | op-kernel-dev-b02957d58a27525499ab10d272d3b44682a7ae50.zip op-kernel-dev-b02957d58a27525499ab10d272d3b44682a7ae50.tar.gz | |
Staging: Merge two branches of coding style fixes together
Turns out that multiple people sent pretty much the same patch
for the same staging drivers. Commit these in two different
branches and merge them together to get a more complete coverage
of the cleanup and properly credit everyone for the work that they
did.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/wlan-ng/p80211conv.c')
| -rw-r--r-- | drivers/staging/wlan-ng/p80211conv.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/staging/wlan-ng/p80211conv.c b/drivers/staging/wlan-ng/p80211conv.c index 99c5ec4..a1605fb 100644 --- a/drivers/staging/wlan-ng/p80211conv.c +++ b/drivers/staging/wlan-ng/p80211conv.c @@ -207,10 +207,9 @@ int skb_ether_to_p80211(wlandevice_t *wlandev, u32 ethconv, p80211_wep->data = kmalloc(skb->len, GFP_ATOMIC); foo = wep_encrypt(wlandev, skb->data, p80211_wep->data, - skb->len, - (wlandev->hostwep & - HOSTWEP_DEFAULTKEY_MASK), - p80211_wep->iv, p80211_wep->icv); + skb->len, + (wlandev->hostwep &HOSTWEP_DEFAULTKEY_MASK), + p80211_wep->iv, p80211_wep->icv); if (foo) { printk(KERN_WARNING "Host en-WEP failed, dropping frame (%d).\n", @@ -324,10 +323,10 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv, return 1; } foo = wep_decrypt(wlandev, skb->data + payload_offset + 4, - payload_length - 8, -1, - skb->data + payload_offset, - skb->data + payload_offset + - payload_length - 4); + payload_length - 8, -1, + skb->data + payload_offset, + skb->data + payload_offset + + payload_length - 4); if (foo) { /* de-wep failed, drop skb. */ pr_debug("Host de-WEP failed, dropping frame (%d).\n", |
