Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317783
b: refs/heads/master
c: 9a671f8
h: refs/heads/master
i:
  317781: 5e79965
  317779: d7060d5
  317775: 96b0a27
v: v3
  • Loading branch information
Jesper Juhl authored and Greg Kroah-Hartman committed Jul 9, 2012
1 parent 46c8d40 commit d942c7e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0c5c79010950afee602436f85864d0ad3f195029
refs/heads/master: 9a671f886f156e67d984057074c6241621961a21
6 changes: 1 addition & 5 deletions trunk/drivers/staging/vt6656/iwctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -964,7 +964,6 @@ int iwctl_giwrts(struct net_device *dev, struct iw_request_info *info,
wrq->value = pDevice->wRTSThreshold;
wrq->disabled = (wrq->value >= 2312);
wrq->fixed = 1;

return 0;
}

Expand Down Expand Up @@ -1003,7 +1002,6 @@ int iwctl_giwfrag(struct net_device *dev, struct iw_request_info *info,
wrq->value = pDevice->wFragmentationThreshold;
wrq->disabled = (wrq->value >= 2312);
wrq->fixed = 1;

return 0;
}

Expand Down Expand Up @@ -1097,7 +1095,6 @@ int iwctl_siwencode(struct net_device *dev, struct iw_request_info *info,

// Send the key to the card
if (wrq->length > 0) {

if (wrq->length == WLAN_WEP232_KEYLEN) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Set 232 bit wep key\n");
} else if (wrq->length == WLAN_WEP104_KEYLEN) {
Expand All @@ -1119,8 +1116,7 @@ int iwctl_siwencode(struct net_device *dev, struct iw_request_info *info,
dwKeyIndex | (1 << 31),
wrq->length, NULL,
pDevice->abyKey,
KEY_CTL_WEP
);
KEY_CTL_WEP);
spin_unlock_irq(&pDevice->lock);
}
pDevice->byKeyIndex = (BYTE)dwKeyIndex;
Expand Down

0 comments on commit d942c7e

Please sign in to comment.