From 6d21d875c1a78aaa66b12a062b6e6044cf8cb061 Mon Sep 17 00:00:00 2001 From: Mike McCormack Date: Fri, 11 Feb 2011 08:44:29 +0900 Subject: [PATCH] --- yaml --- r: 235975 b: refs/heads/master c: 3b10c0a4685d95532bdc7b2e865ace808d66295c h: refs/heads/master i: 235973: 075b82406257665f2c9b545ec78d9edf7ea649a9 235971: 95fcdbd5308b7de7b0d62c955d87d9d17b0d180a 235967: 10e4edc3864e9c22bfb4455431d9dfddf20700cc v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8192e/r8192E.h | 1 - trunk/drivers/staging/rtl8192e/r8192E_core.c | 3 ++- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8a460d8cac6c..91ac4dbdb18e 100644 --- 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 index 92ecfc24b74d..f25e97542660 100644 --- 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 index 39f8ca8373d2..1b0cd9eac5d3 100644 --- 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;