Fix sparse warnings and compile errors reported with includes in ieee80211_skb.h

git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@2908 0192ed92-7a03-0410-a25b-9323aeb14dbd
This commit is contained in:
mtaylor 2007-11-22 00:24:26 +00:00
parent 932d54e246
commit 54d2029f21
2 changed files with 14 additions and 17 deletions

View File

@ -626,7 +626,7 @@ int netif_rx_debug(struct sk_buff *skb, const char* func, int line) {
return netif_rx(untrack_skb(skb, 0, func, line, __func__, __LINE__));
}
struct sk_buff * alloc_skb_debug(unsigned int length, int gfp_mask,
struct sk_buff * alloc_skb_debug(unsigned int length, gfp_t gfp_mask,
const char *func, int line) {
return track_skb(alloc_skb(length, gfp_mask), 0 /* users_adjustment */,
func, line, __func__, __LINE__);
@ -641,7 +641,7 @@ struct sk_buff * dev_alloc_skb_debug(unsigned int length,
struct sk_buff * skb_clone_debug(struct sk_buff *skb, int pri,
struct sk_buff * skb_clone_debug(struct sk_buff *skb, gfp_t pri,
const char *func, int line)
{
return track_skb(
@ -649,7 +649,7 @@ struct sk_buff * skb_clone_debug(struct sk_buff *skb, int pri,
func, line, __func__, __LINE__);
}
struct sk_buff * skb_copy_debug(struct sk_buff *skb, int pri,
struct sk_buff * skb_copy_debug(struct sk_buff *skb, gfp_t pri,
const char *func, int line)
{
return track_skb(
@ -675,7 +675,7 @@ struct sk_buff * skb_realloc_headroom_debug(struct sk_buff *skb, unsigned int he
func, line, __func__, __LINE__);
}
struct sk_buff * pskb_copy_debug(struct sk_buff *skb, int pri,
struct sk_buff * pskb_copy_debug(struct sk_buff *skb, gfp_t pri,
const char *func, int line)
{
return track_skb(
@ -690,7 +690,7 @@ int dev_queue_xmit_debug(struct sk_buff *skb,
return dev_queue_xmit(untrack_skb(skb, 0, func, line, __func__, __LINE__));
}
struct sk_buff * skb_share_check_debug(struct sk_buff *skb, int pri,
struct sk_buff * skb_share_check_debug(struct sk_buff *skb, gfp_t pri,
const char *func, int line)
{
might_sleep_if(pri & __GFP_WAIT);
@ -713,7 +713,7 @@ void kfree_skb_fast_debug(struct sk_buff *skb,
unref_skb(skb, UNREF_USE_DEV_KFREE_SKB_ANY, func, line, __func__, __LINE__);
}
struct sk_buff * skb_unshare_debug(struct sk_buff *skb, int pri,
struct sk_buff * skb_unshare_debug(struct sk_buff *skb, gfp_t pri,
const char *func, int line)
{
might_sleep_if(pri & __GFP_WAIT);
@ -729,7 +729,7 @@ struct sk_buff * skb_unshare_debug(struct sk_buff *skb, int pri,
}
struct sk_buff * skb_copy_expand_debug(const struct sk_buff *skb, int newheadroom,
int newtailroom, int gfp_mask,
int newtailroom, gfp_t gfp_mask,
const char *func, int line)
{
return track_skb(

View File

@ -29,9 +29,6 @@
#ifndef _NET80211_IEEE80211_SKB_H_
#define _NET80211_IEEE80211_SKB_H_
#include <linux/skbuff.h>
#include <linux/if_vlan.h>
/*******************************************************************************
* Globals
******************************************************************************/
@ -113,30 +110,30 @@ int vlan_hwaccel_receive_skb_debug(struct sk_buff *skb,
struct vlan_group *grp, unsigned short vlan_tag,
const char* func, int line);
int netif_rx_debug(struct sk_buff *skb, const char* func, int line);
struct sk_buff * alloc_skb_debug(unsigned int length, int gfp_mask,
struct sk_buff * alloc_skb_debug(unsigned int length, gfp_t gfp_mask,
const char *func, int line);
struct sk_buff * dev_alloc_skb_debug(unsigned int length,
const char *func, int line);
struct sk_buff * skb_clone_debug(struct sk_buff *skb, int pri,
struct sk_buff * skb_clone_debug(struct sk_buff *skb, gfp_t pri,
const char *func, int line);
struct sk_buff * skb_copy_debug(struct sk_buff *skb, int pri,
struct sk_buff * skb_copy_debug(struct sk_buff *skb, gfp_t pri,
const char *func, int line);
struct sk_buff * skb_get_debug(struct sk_buff *skb,
const char *func, int line);
struct sk_buff * skb_realloc_headroom_debug(struct sk_buff *skb, unsigned int headroom,
const char *func, int line);
struct sk_buff * pskb_copy_debug(struct sk_buff *skb, int pri,
struct sk_buff * pskb_copy_debug(struct sk_buff *skb, gfp_t pri,
const char *func, int line);
int dev_queue_xmit_debug(struct sk_buff *skb,
const char *func, int line);
struct sk_buff * skb_share_check_debug(struct sk_buff *skb, int pri,
struct sk_buff * skb_share_check_debug(struct sk_buff *skb, gfp_t pri,
const char *func, int line);
void kfree_skb_fast_debug(struct sk_buff *skb,
const char* func, int line);
struct sk_buff * skb_unshare_debug(struct sk_buff *skb, int pri,
struct sk_buff * skb_unshare_debug(struct sk_buff *skb, gfp_t pri,
const char *func, int line);
struct sk_buff * skb_copy_expand_debug(const struct sk_buff *skb, int newheadroom,
int newtailroom, int gfp_mask,
int newtailroom, gfp_t gfp_mask,
const char *func, int line);
#undef alloc_skb