Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 267796
b: refs/heads/master
c: f198db0
h: refs/heads/master
v: v3
  • Loading branch information
Larry Finger authored and Larry Finger committed Aug 24, 2011
1 parent 8ead5e4 commit 9e1b733
Show file tree
Hide file tree
Showing 3 changed files with 6 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: 6857f36710863716dc60c49e33769dd694aacda6
refs/heads/master: f198db0c985ca627f9d068a00f6836c40ef4e737
4 changes: 2 additions & 2 deletions trunk/drivers/staging/rtl8192e/rtl819x_BA.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ union ba_param_set {
} field;
};

typedef union _DELBA_PARAM_SET {
union delba_param_set {
u8 charData[2];
u16 shortData;
struct {
u16 Reserved:11;
u16 Initiator:1;
u16 TID:4;
} field;
} DELBA_PARAM_SET, *PDELBA_PARAM_SET;
};

struct ba_record {
struct timer_list Timer;
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/rtl8192e/rtl819x_BAProc.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ static struct sk_buff* rtllib_DELBA(
u16 ReasonCode
)
{
DELBA_PARAM_SET DelbaParamSet;
union delba_param_set DelbaParamSet;
struct sk_buff *skb = NULL;
struct rtllib_hdr_3addr* Delba = NULL;
u8* tag = NULL;
Expand Down Expand Up @@ -430,7 +430,7 @@ int rtllib_rx_ADDBARsp( struct rtllib_device* ieee, struct sk_buff *skb)
int rtllib_rx_DELBA(struct rtllib_device* ieee,struct sk_buff *skb)
{
struct rtllib_hdr_3addr* delba = NULL;
PDELBA_PARAM_SET pDelBaParamSet = NULL;
union delba_param_set *pDelBaParamSet = NULL;
u16* pReasonCode = NULL;
u8* dst = NULL;

Expand All @@ -452,7 +452,7 @@ int rtllib_rx_DELBA(struct rtllib_device* ieee,struct sk_buff *skb)
delba = ( struct rtllib_hdr_3addr*)skb->data;
dst = (u8*)(&delba->addr2[0]);
delba += sizeof( struct rtllib_hdr_3addr);
pDelBaParamSet = (PDELBA_PARAM_SET)(delba+2);
pDelBaParamSet = (union delba_param_set *)(delba+2);
pReasonCode = (u16*)(delba+4);

if (pDelBaParamSet->field.Initiator == 1)
Expand Down

0 comments on commit 9e1b733

Please sign in to comment.