Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 338047
b: refs/heads/master
c: 18637d9
h: refs/heads/master
i:
  338045: 1b9d1dc
  338043: 2ffce46
  338039: 8587203
  338031: b6105c7
  338015: d3aecf8
  337983: 53277b3
  337919: 69910e8
v: v3
  • Loading branch information
YAMANE Toshiaki authored and Greg Kroah-Hartman committed Nov 21, 2012
1 parent 76f55ce commit 3fb0f9c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: 3bba8b9657f5bc2af70ee3af31e758485e310909
refs/heads/master: 18637d934d50b828b766f4317408083a8a12f054
4 changes: 2 additions & 2 deletions trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ int ieee80211_unregister_crypto_ops(struct ieee80211_crypto_ops *ops)
}


struct ieee80211_crypto_ops * ieee80211_get_crypto_ops(const char *name)
struct ieee80211_crypto_ops *ieee80211_get_crypto_ops(const char *name)
{
unsigned long flags;
struct list_head *ptr;
Expand All @@ -181,7 +181,7 @@ struct ieee80211_crypto_ops * ieee80211_get_crypto_ops(const char *name)
}


static void * ieee80211_crypt_null_init(int keyidx) { return (void *) 1; }
static void *ieee80211_crypt_null_init(int keyidx) { return (void *) 1; }
static void ieee80211_crypt_null_deinit(void *priv) {}

static struct ieee80211_crypto_ops ieee80211_crypt_null = {
Expand Down

0 comments on commit 3fb0f9c

Please sign in to comment.