Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 338279
b: refs/heads/master
c: 9e2c0a6
h: refs/heads/master
i:
  338277: 7f31596
  338275: c6b9f3d
  338271: 95e6f31
v: v3
  • Loading branch information
YAMANE Toshiaki authored and Greg Kroah-Hartman committed Nov 28, 2012
1 parent 7ac9dd6 commit be3f37c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 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: c6f255334a74df7bd99274dae8e80c0e1c989b28
refs/heads/master: 9e2c0a6bb7f0cfac8cb6dea9866c449d5ae97673
8 changes: 4 additions & 4 deletions trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ static int ieee80211_is_eapol_frame(struct ieee80211_device *ieee,

/* Called only as a tasklet (software IRQ), by ieee80211_rx */
static inline int
ieee80211_rx_frame_decrypt(struct ieee80211_device* ieee, struct sk_buff *skb,
ieee80211_rx_frame_decrypt(struct ieee80211_device *ieee, struct sk_buff *skb,
struct ieee80211_crypt_data *crypt)
{
struct ieee80211_hdr_4addr *hdr;
Expand Down Expand Up @@ -337,7 +337,7 @@ ieee80211_rx_frame_decrypt(struct ieee80211_device* ieee, struct sk_buff *skb,

/* Called only as a tasklet (software IRQ), by ieee80211_rx */
static inline int
ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device* ieee, struct sk_buff *skb,
ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device *ieee, struct sk_buff *skb,
int keyidx, struct ieee80211_crypt_data *crypt)
{
struct ieee80211_hdr_4addr *hdr;
Expand Down Expand Up @@ -841,7 +841,7 @@ static inline void ieee80211_extract_country_ie(
struct ieee80211_device *ieee,
struct ieee80211_info_element *info_element,
struct ieee80211_network *network,
u8 * addr2
u8 *addr2
)
{
if (IS_DOT11D_ENABLE(ieee)) {
Expand Down Expand Up @@ -1187,7 +1187,7 @@ inline int ieee80211_network_init(

static inline int is_same_network(struct ieee80211_network *src,
struct ieee80211_network *dst,
struct ieee80211_device * ieee)
struct ieee80211_device *ieee)
{
/* A network is only a duplicate if the channel, BSSID, ESSID
* and the capability field (in particular IBSS and BSS) all match.
Expand Down

0 comments on commit be3f37c

Please sign in to comment.