1
0
mirror of https://github.com/abperiasamy/rtl8812AU_8821AU_linux.git synced 2025-08-16 08:34:15 +02:00

Merge pull request #65 from AndyPi/master

rtw_mem functions const pointers and extra aparameters to rtw_select_queue
This commit is contained in:
Harshavardhana 2015-06-12 10:55:52 -07:00
commit c0154d9241
4 changed files with 15 additions and 8 deletions

View File

@ -164,8 +164,8 @@ extern void _rtw_mfree(u8 *pbuf, u32 sz);
extern void* rtw_malloc2d(int h, int w, int size);
extern void rtw_mfree2d(void *pbuf, int h, int w, int size);
extern void _rtw_memcpy(void* dec, void* sour, u32 sz);
extern int _rtw_memcmp(void *dst, void *src, u32 sz);
extern void _rtw_memcpy(void* dec, const void* sour, u32 sz);
extern int _rtw_memcmp(const void *dst, const void *src, u32 sz);
extern void _rtw_memset(void *pbuf, int c, u32 sz);
extern void _rtw_init_listhead(_list *list);

View File

@ -3697,7 +3697,7 @@ static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev)
#endif //(LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0))
static int cfg80211_rtw_add_station(struct wiphy *wiphy, struct net_device *ndev,
u8 *mac, struct station_parameters *params)
const u8 *mac, struct station_parameters *params)
{
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
@ -3705,7 +3705,7 @@ static int cfg80211_rtw_add_station(struct wiphy *wiphy, struct net_device *ndev
}
static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev,
u8 *mac)
const u8 *mac)
{
int ret=0;
_irqL irqL;
@ -3796,7 +3796,7 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev
}
static int cfg80211_rtw_change_station(struct wiphy *wiphy, struct net_device *ndev,
u8 *mac, struct station_parameters *params)
const u8 *mac, struct station_parameters *params)
{
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));

View File

@ -1641,7 +1641,14 @@ unsigned int rtw_classify8021d(struct sk_buff *skb)
return dscp >> 5;
}
static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb)
static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(3,13,0))
,void *accel_priv
#endif
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(3,14,0))
,select_queue_fallback_t fallback
#endif
)
{
_adapter *padapter = rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

View File

@ -485,7 +485,7 @@ void rtw_mfree2d(void *pbuf, int h, int w, int size)
rtw_mfree((u8 *)pbuf, h*sizeof(void*) + w*h*size);
}
void _rtw_memcpy(void* dst, void* src, u32 sz)
void _rtw_memcpy(void* dst, const void* src, u32 sz)
{
#if defined (PLATFORM_LINUX)|| defined (PLATFORM_FREEBSD)
@ -502,7 +502,7 @@ void _rtw_memcpy(void* dst, void* src, u32 sz)
}
int _rtw_memcmp(void *dst, void *src, u32 sz)
int _rtw_memcmp(const void *dst, const void *src, u32 sz)
{
#if defined (PLATFORM_LINUX)|| defined (PLATFORM_FREEBSD)