d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow net80211 to compile on stable/9 and stable/8.

Browse Source
This commit is contained in:
Adrian Chadd 2013-08-07 22:01:43 +00:00
parent 4f7b34578b
commit cc80eae5cf
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=254076
4 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/net80211/ieee80211.c
View File

@ -241,9 +241,15 @@ null_transmit(struct ifnet *ifp, struct mbuf *m)
return EACCES; /* XXX EIO/EPERM? */
}
#if __FreeBSD_version >= 1000031
static int
null_output(struct ifnet *ifp, struct mbuf *m,
const struct sockaddr *dst, struct route *ro)
#else
static int
null_output(struct ifnet *ifp, struct mbuf *m,
struct sockaddr *dst, struct route *ro)
#endif
{
if_printf(ifp, "discard raw packet\n");
return null_transmit(ifp, m);

6
sys/net80211/ieee80211_output.c
View File

@ -482,9 +482,15 @@ ieee80211_raw_output(struct ieee80211vap *vap, struct ieee80211_node *ni,
* connect bpf write calls to the 802.11 layer for injecting
* raw 802.11 frames.
*/
#if __FreeBSD_version >= 1000031
int
ieee80211_output(struct ifnet *ifp, struct mbuf *m,
const struct sockaddr *dst, struct route *ro)
#else
int
ieee80211_output(struct ifnet *ifp, struct mbuf *m,
struct sockaddr *dst, struct route *ro)
#endif
{
#define senderr(e) do { error = (e); goto bad;} while (0)
struct ieee80211_node *ni = NULL;

5
sys/net80211/ieee80211_proto.h
View File

@ -96,8 +96,13 @@ int ieee80211_mgmt_output(struct ieee80211_node *, struct mbuf *, int,
struct ieee80211_bpf_params *);
int ieee80211_raw_xmit(struct ieee80211_node *, struct mbuf *,
const struct ieee80211_bpf_params *);
#if __FreeBSD_version >= 1000031
int ieee80211_output(struct ifnet *, struct mbuf *,
const struct sockaddr *, struct route *ro);
#else
int ieee80211_output(struct ifnet *, struct mbuf *,
struct sockaddr *, struct route *ro);
#endif
int ieee80211_vap_pkt_send_dest(struct ieee80211vap *, struct mbuf *,
struct ieee80211_node *);
int ieee80211_raw_output(struct ieee80211vap *, struct ieee80211_node *,

5
sys/net80211/ieee80211_var.h
View File

@ -496,8 +496,13 @@ struct ieee80211vap {
int (*iv_newstate)(struct ieee80211vap *,
enum ieee80211_state, int);
/* 802.3 output method for raw frame xmit */
#if __FreeBSD_version >= 1000031
int (*iv_output)(struct ifnet *, struct mbuf *,
const struct sockaddr *, struct route *);
#else
int (*iv_output)(struct ifnet *, struct mbuf *,
struct sockaddr *, struct route *);
#endif
uint64_t iv_spare[6];
};
MALLOC_DECLARE(M_80211_VAP);