From: Mateusz Kulikowski Date: Sun, 20 Sep 2015 08:13:49 +0000 (+0200) Subject: staging: rtl8192e: Rename rtl8192_hard_start_xmit X-Git-Tag: firefly_0821_release~176^2~802^2~1640 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3e49f3eca24734c064a86575838bd89b3fd7a3a8;p=firefly-linux-kernel-4.4.55.git staging: rtl8192e: Rename rtl8192_hard_start_xmit Use naming schema found in other rtlwifi devices. Rename rtl8192_hard_start_xmit to _rtl92e_hard_start_xmit. Signed-off-by: Mateusz Kulikowski Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index cf6e9643cfae..ec9d2c2d09ea 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -92,7 +92,7 @@ static void _rtl92e_watchdog_wq_cb(void *data); static void _rtl92e_watchdog_timer_cb(unsigned long data); static void _rtl92e_hard_data_xmit(struct sk_buff *skb, struct net_device *dev, int rate); -static int rtl8192_hard_start_xmit(struct sk_buff *skb, struct net_device *dev); +static int _rtl92e_hard_start_xmit(struct sk_buff *skb, struct net_device *dev); static void _rtl92e_tx_cmd(struct net_device *dev, struct sk_buff *skb); static short _rtl92e_tx(struct net_device *dev, struct sk_buff *skb); static short _rtl92e_pci_initdescring(struct net_device *dev); @@ -852,7 +852,7 @@ static void _rtl92e_init_priv_handler(struct net_device *dev) { struct r8192_priv *priv = rtllib_priv(dev); - priv->rtllib->softmac_hard_start_xmit = rtl8192_hard_start_xmit; + priv->rtllib->softmac_hard_start_xmit = _rtl92e_hard_start_xmit; priv->rtllib->set_chan = _rtl92e_set_chan; priv->rtllib->link_change = priv->ops->link_change; priv->rtllib->softmac_data_hard_start_xmit = _rtl92e_hard_data_xmit; @@ -1654,7 +1654,7 @@ static void _rtl92e_hard_data_xmit(struct sk_buff *skb, struct net_device *dev, } } -static int rtl8192_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) +static int _rtl92e_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) { struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); int ret;