Author: adrian
Date: Wed Aug 7 22:01:43 2013
New Revision: 254076
URL: http://svnweb.freebsd.org/changeset/base/254076
Log:
Allow net80211 to compile on stable/9 and stable/8.
Modified:
head/sys/net80211/ieee80211.c
head/sys/net80211/ieee80211_output.c
head/sys/net80211/ieee80211_proto.h
head/sys/net80211/ieee80211_var.h
Modified: head/sys/net80211/ieee80211.c
==============================================================================
--- head/sys/net80211/ieee80211.c Wed Aug 7 21:51:19 2013
(r254075)
+++ head/sys/net80211/ieee80211.c Wed Aug 7 22:01:43 2013
(r254076)
@@ -241,9 +241,15 @@ null_transmit(struct ifnet *ifp, struct
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);
Modified: head/sys/net80211/ieee80211_output.c
==============================================================================
--- head/sys/net80211/ieee80211_output.c Wed Aug 7 21:51:19 2013
(r254075)
+++ head/sys/net80211/ieee80211_output.c Wed Aug 7 22:01:43 2013
(r254076)
@@ -482,9 +482,15 @@ ieee80211_raw_output(struct ieee80211vap
* 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;
Modified: head/sys/net80211/ieee80211_proto.h
==============================================================================
--- head/sys/net80211/ieee80211_proto.h Wed Aug 7 21:51:19 2013
(r254075)
+++ head/sys/net80211/ieee80211_proto.h Wed Aug 7 22:01:43 2013
(r254076)
@@ -96,8 +96,13 @@ int ieee80211_mgmt_output(struct ieee802
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 *,
Modified: head/sys/net80211/ieee80211_var.h
==============================================================================
--- head/sys/net80211/ieee80211_var.h Wed Aug 7 21:51:19 2013
(r254075)
+++ head/sys/net80211/ieee80211_var.h Wed Aug 7 22:01:43 2013
(r254076)
@@ -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);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
