---

yaml --- r: 235975 b: refs/heads/master c: 3b10c0a h: refs/heads/master i: 235973: 075b824 235971: 95fcdbd 235967: 10e4edc v: v3
git-mirror · Feb 18, 2011 · 6d21d87 · 6d21d87
1 parent 498b35b
commit 6d21d87
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b1a26f8d34d67104d634acc0799960ddad803ca
+refs/heads/master: 3b10c0a4685d95532bdc7b2e865ace808d66295c
diff --git a/trunk/drivers/staging/rtl8192e/r8192E.h b/trunk/drivers/staging/rtl8192e/r8192E.h
@@ -1039,7 +1039,6 @@ typedef struct r8192_priv
 }r8192_priv;
 
 bool init_firmware(struct net_device *dev);
-short rtl8192_tx(struct net_device *dev, struct sk_buff* skb);
 u32 read_cam(struct r8192_priv *priv, u8 addr);
 void write_cam(struct r8192_priv *priv, u8 addr, u32 data);
 u8 read_nic_byte(struct r8192_priv *priv, int x);

diff --git a/trunk/drivers/staging/rtl8192e/r8192E_core.c b/trunk/drivers/staging/rtl8192e/r8192E_core.c
@@ -109,6 +109,7 @@ static void rtl8192_restart(struct work_struct *work);
 static void watch_dog_timer_callback(unsigned long data);
 static int _rtl8192_up(struct net_device *dev);
 static void rtl8192_cancel_deferred_work(struct r8192_priv* priv);
+static short rtl8192_tx(struct net_device *dev, struct sk_buff* skb);
 
 #ifdef ENABLE_DOT11D
 
@@ -1255,7 +1256,7 @@ static u8 QueryIsShort(u8 TxHT, u8 TxRate, cb_desc *tcb_desc)
  * skb->cb will contain all the following information,
  * priority, morefrag, rate, &dev.
  */
-short rtl8192_tx(struct net_device *dev, struct sk_buff* skb)
+static short rtl8192_tx(struct net_device *dev, struct sk_buff* skb)
 {
 	struct r8192_priv *priv = ieee80211_priv(dev);
 	struct rtl8192_tx_ring *ring;