From: Mateusz Kulikowski Date: Sun, 20 Sep 2015 08:14:13 +0000 (+0200) Subject: staging: rtl8192e: Rename rtl8192_check_nic_enough_desc X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=288adaf5a6d5b81e2d2f169f94a6c3b5d9e80296;p=openwrt%2Fstaging%2Fblogic.git staging: rtl8192e: Rename rtl8192_check_nic_enough_desc Use naming schema found in other rtlwifi devices. Rename rtl8192_check_nic_enough_desc to _rtl92e_check_nic_enough_desc. 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 0fcaf1bf925c..887ba0414e7d 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -272,7 +272,7 @@ bool rtl92e_set_rf_state(struct net_device *dev, return bActionAllowed; } -static short rtl8192_check_nic_enough_desc(struct net_device *dev, int prio) +static short _rtl92e_check_nic_enough_desc(struct net_device *dev, int prio) { struct r8192_priv *priv = rtllib_priv(dev); struct rtl8192_tx_ring *ring = &priv->tx_ring[prio]; @@ -856,7 +856,7 @@ static void _rtl92e_init_priv_handler(struct net_device *dev) 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; - priv->rtllib->check_nic_enough_desc = rtl8192_check_nic_enough_desc; + priv->rtllib->check_nic_enough_desc = _rtl92e_check_nic_enough_desc; priv->rtllib->handle_assoc_response = _rtl92e_handle_assoc_response; priv->rtllib->handle_beacon = _rtl92e_handle_beacon; priv->rtllib->SetWirelessMode = rtl92e_set_wireless_mode;