Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 186562
b: refs/heads/master
c: 8125e2f
h: refs/heads/master
v: v3
  • Loading branch information
Simon Horman authored and Greg Kroah-Hartman committed Mar 4, 2010
1 parent f1a0cd2 commit 53ae791
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e8ffaa3a06a71a5a02373cfcb5f474f9a181ec68
refs/heads/master: 8125e2f66800f9e16e632df20fa3195c07f6aaf9
15 changes: 15 additions & 0 deletions trunk/drivers/staging/wlan-ng/p80211wext.c
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ static int p80211wext_dorequest(wlandevice_t *wlandev, u32 did, u32 data)
int result;

msg.msgcode = DIDmsg_dot11req_mibset;
memset(&mibitem, 0, sizeof(mibitem));
mibitem.did = did;
mibitem.data = data;
memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
Expand Down Expand Up @@ -269,6 +270,7 @@ static int p80211wext_giwfreq(netdevice_t *dev,
int err = 0;

msg.msgcode = DIDmsg_dot11req_mibget;
memset(&mibitem, 0, sizeof(mibitem));
mibitem.did = DIDmib_dot11phy_dot11PhyDSSSTable_dot11CurrentChannel;
memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
result = p80211req_dorequest(wlandev, (u8 *) & msg);
Expand Down Expand Up @@ -309,6 +311,7 @@ static int p80211wext_siwfreq(netdevice_t *dev,
}

msg.msgcode = DIDmsg_dot11req_mibset;
memset(&mibitem, 0, sizeof(mibitem));
mibitem.did = DIDmib_dot11phy_dot11PhyDSSSTable_dot11CurrentChannel;
mibitem.status = P80211ENUM_msgitem_status_data_ok;

Expand Down Expand Up @@ -396,6 +399,7 @@ static int p80211wext_siwmode(netdevice_t *dev,

/* Set Operation mode to the PORT TYPE RID */
msg.msgcode = DIDmsg_dot11req_mibset;
memset(&mibitem, 0, sizeof(mibitem));
mibitem.did = DIDmib_p2_p2Static_p2CnfPortType;
mibitem.data = (*mode == IW_MODE_ADHOC) ? 0 : 1;
memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
Expand Down Expand Up @@ -771,6 +775,7 @@ static int p80211wext_giwrate(netdevice_t *dev,
int err = 0;

msg.msgcode = DIDmsg_dot11req_mibget;
memset(&mibitem, 0, sizeof(mibitem));
mibitem.did = DIDmib_p2_p2MAC_p2CurrentTxRate;
memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
result = p80211req_dorequest(wlandev, (u8 *) & msg);
Expand Down Expand Up @@ -822,6 +827,7 @@ static int p80211wext_giwrts(netdevice_t *dev,
int err = 0;

msg.msgcode = DIDmsg_dot11req_mibget;
memset(&mibitem, 0, sizeof(mibitem));
mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11RTSThreshold;
memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
result = p80211req_dorequest(wlandev, (u8 *) & msg);
Expand Down Expand Up @@ -857,6 +863,7 @@ static int p80211wext_siwrts(netdevice_t *dev,
}

msg.msgcode = DIDmsg_dot11req_mibget;
memset(&mibitem, 0, sizeof(mibitem));
mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11RTSThreshold;
if (rts->disabled)
mibitem.data = 2347;
Expand Down Expand Up @@ -886,6 +893,7 @@ static int p80211wext_giwfrag(netdevice_t *dev,
int err = 0;

msg.msgcode = DIDmsg_dot11req_mibget;
memset(&mibitem, 0, sizeof(mibitem));
mibitem.did =
DIDmib_dot11mac_dot11OperationTable_dot11FragmentationThreshold;
memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
Expand Down Expand Up @@ -922,6 +930,7 @@ static int p80211wext_siwfrag(netdevice_t *dev,
}

msg.msgcode = DIDmsg_dot11req_mibset;
memset(&mibitem, 0, sizeof(mibitem));
mibitem.did =
DIDmib_dot11mac_dot11OperationTable_dot11FragmentationThreshold;

Expand Down Expand Up @@ -962,6 +971,7 @@ static int p80211wext_giwretry(netdevice_t *dev,
u16 shortretry, longretry, lifetime;

msg.msgcode = DIDmsg_dot11req_mibget;
memset(&mibitem, 0, sizeof(mibitem));
mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11ShortRetryLimit;

memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
Expand Down Expand Up @@ -1037,6 +1047,8 @@ static int p80211wext_siwretry(netdevice_t *dev,
int result;
int err = 0;

memset(&mibitem, 0, sizeof(mibitem));

if (!wlan_wext_write) {
err = (-EOPNOTSUPP);
goto exit;
Expand Down Expand Up @@ -1114,6 +1126,7 @@ static int p80211wext_siwtxpow(netdevice_t *dev,
}

msg.msgcode = DIDmsg_dot11req_mibset;
memset(&mibitem, 0, sizeof(mibitem));
mibitem.did =
DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel;
if (rrq->fixed == 0)
Expand Down Expand Up @@ -1143,6 +1156,8 @@ static int p80211wext_giwtxpow(netdevice_t *dev,
int err = 0;

msg.msgcode = DIDmsg_dot11req_mibget;

memset(&mibitem, 0, sizeof(mibitem));
mibitem.did =
DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel;

Expand Down

0 comments on commit 53ae791

Please sign in to comment.