Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 281049
b: refs/heads/master
c: 6f03053
h: refs/heads/master
i:
  281047: 549ceb4
v: v3
  • Loading branch information
Jesper Juhl authored and Greg Kroah-Hartman committed Nov 27, 2011
1 parent c6fffdf commit 5429939
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 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: 7c19c1e80d348a5c79b65f9fc3d54bbbeea9cd0f
refs/heads/master: 6f03053b6810c7ca315afb30b31b63d9f5863faf
2 changes: 1 addition & 1 deletion trunk/drivers/staging/rtl8192e/rtllib.h
Original file line number Diff line number Diff line change
Expand Up @@ -2804,7 +2804,7 @@ extern int rtllib_wx_set_gen_ie(struct rtllib_device *ieee, u8 *ie, size_t len);

/* rtllib_softmac.c */
extern short rtllib_is_54g(struct rtllib_network *net);
extern short rtllib_is_shortslot(struct rtllib_network net);
extern short rtllib_is_shortslot(const struct rtllib_network *net);
extern int rtllib_rx_frame_softmac(struct rtllib_device *ieee,
struct sk_buff *skb,
struct rtllib_rx_stats *rx_stats, u16 type,
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/rtl8192e/rtllib_softmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ short rtllib_is_54g(struct rtllib_network *net)
return (net->rates_ex_len > 0) || (net->rates_len > 4);
}

short rtllib_is_shortslot(struct rtllib_network net)
short rtllib_is_shortslot(const struct rtllib_network *net)
{
return net.capability & WLAN_CAPABILITY_SHORT_SLOT_TIME;
return net->capability & WLAN_CAPABILITY_SHORT_SLOT_TIME;
}

/* returns the total length needed for pleacing the RATE MFIE
Expand Down

0 comments on commit 5429939

Please sign in to comment.