Re: svn commit: r286437 - in head/sys: dev/ath dev/ath/ath_rate/sample dev/bwi dev/bwn dev/if_ndis dev/ipw dev/iwi dev/iwn dev/malo dev/mwl dev/ral dev/usb/wlan dev/wi dev/wpi dev/wtap net80211

2015-08-11 Thread Gleb Smirnoff 
On Sat, Aug 08, 2015 at 01:10:19AM +, Adrian Chadd wrote:
A Author: adrian
A Date: Sat Aug  8 01:10:17 2015
A New Revision: 286437
A URL: https://svnweb.freebsd.org/changeset/base/286437
A 
A Log:
A   Revert the wifi ifnet changes until things are more baked and tested.
A   
A   * 286410
A   * 286413
A   * 286416
A   
A   The initial commit broke a variety of debug and features that aren't
A   in the GENERIC kernels but are enabled in other platforms.

Here is latest patch, that passes all universe kernels.

-- 
Totus tuus, Glebius.


net80211.diff.bz2
Description: Binary data
___
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

svn commit: r286437 - in head/sys: dev/ath dev/ath/ath_rate/sample dev/bwi dev/bwn dev/if_ndis dev/ipw dev/iwi dev/iwn dev/malo dev/mwl dev/ral dev/usb/wlan dev/wi dev/wpi dev/wtap net80211

2015-08-07 Thread Adrian Chadd 
Author: adrian
Date: Sat Aug  8 01:10:17 2015
New Revision: 286437
URL: https://svnweb.freebsd.org/changeset/base/286437

Log:
  Revert the wifi ifnet changes until things are more baked and tested.
  
  * 286410
  * 286413
  * 286416
  
  The initial commit broke a variety of debug and features that aren't
  in the GENERIC kernels but are enabled in other platforms.

Modified:
  head/sys/dev/ath/ath_rate/sample/sample.c
  head/sys/dev/ath/ath_rate/sample/sample.h
  head/sys/dev/ath/if_ath.c
  head/sys/dev/ath/if_ath_beacon.c
  head/sys/dev/ath/if_ath_debug.h
  head/sys/dev/ath/if_ath_keycache.c
  head/sys/dev/ath/if_ath_misc.h
  head/sys/dev/ath/if_ath_rx.c
  head/sys/dev/ath/if_ath_rx_edma.c
  head/sys/dev/ath/if_ath_sysctl.c
  head/sys/dev/ath/if_ath_tdma.c
  head/sys/dev/ath/if_ath_tx.c
  head/sys/dev/ath/if_ath_tx_edma.c
  head/sys/dev/ath/if_athvar.h
  head/sys/dev/bwi/bwimac.c
  head/sys/dev/bwi/bwiphy.c
  head/sys/dev/bwi/bwirf.c
  head/sys/dev/bwi/if_bwi.c
  head/sys/dev/bwi/if_bwivar.h
  head/sys/dev/bwn/if_bwn.c
  head/sys/dev/bwn/if_bwnvar.h
  head/sys/dev/if_ndis/if_ndis.c
  head/sys/dev/if_ndis/if_ndisvar.h
  head/sys/dev/ipw/if_ipw.c
  head/sys/dev/ipw/if_ipwvar.h
  head/sys/dev/iwi/if_iwi.c
  head/sys/dev/iwi/if_iwivar.h
  head/sys/dev/iwn/if_iwn.c
  head/sys/dev/iwn/if_iwnvar.h
  head/sys/dev/malo/if_malo.c
  head/sys/dev/malo/if_malo.h
  head/sys/dev/mwl/if_mwl.c
  head/sys/dev/mwl/if_mwl_pci.c
  head/sys/dev/mwl/if_mwlvar.h
  head/sys/dev/ral/if_ral_pci.c
  head/sys/dev/ral/rt2560.c
  head/sys/dev/ral/rt2560var.h
  head/sys/dev/ral/rt2661.c
  head/sys/dev/ral/rt2661var.h
  head/sys/dev/ral/rt2860.c
  head/sys/dev/ral/rt2860var.h
  head/sys/dev/usb/wlan/if_rsu.c
  head/sys/dev/usb/wlan/if_rsureg.h
  head/sys/dev/usb/wlan/if_rum.c
  head/sys/dev/usb/wlan/if_rumvar.h
  head/sys/dev/usb/wlan/if_run.c
  head/sys/dev/usb/wlan/if_runvar.h
  head/sys/dev/usb/wlan/if_uath.c
  head/sys/dev/usb/wlan/if_uathvar.h
  head/sys/dev/usb/wlan/if_upgt.c
  head/sys/dev/usb/wlan/if_upgtvar.h
  head/sys/dev/usb/wlan/if_ural.c
  head/sys/dev/usb/wlan/if_uralvar.h
  head/sys/dev/usb/wlan/if_urtw.c
  head/sys/dev/usb/wlan/if_urtwn.c
  head/sys/dev/usb/wlan/if_urtwnreg.h
  head/sys/dev/usb/wlan/if_urtwvar.h
  head/sys/dev/usb/wlan/if_zyd.c
  head/sys/dev/usb/wlan/if_zydreg.h
  head/sys/dev/wi/if_wi.c
  head/sys/dev/wi/if_wi_pccard.c
  head/sys/dev/wi/if_wi_pci.c
  head/sys/dev/wi/if_wivar.h
  head/sys/dev/wpi/if_wpi.c
  head/sys/dev/wpi/if_wpivar.h
  head/sys/dev/wtap/if_wtap.c
  head/sys/dev/wtap/if_wtapvar.h
  head/sys/net80211/ieee80211.c
  head/sys/net80211/ieee80211_ddb.c
  head/sys/net80211/ieee80211_freebsd.c
  head/sys/net80211/ieee80211_ioctl.c
  head/sys/net80211/ieee80211_output.c
  head/sys/net80211/ieee80211_power.c
  head/sys/net80211/ieee80211_proto.c
  head/sys/net80211/ieee80211_proto.h
  head/sys/net80211/ieee80211_regdomain.c
  head/sys/net80211/ieee80211_scan_sta.c
  head/sys/net80211/ieee80211_var.h

Modified: head/sys/dev/ath/ath_rate/sample/sample.c
==
--- head/sys/dev/ath/ath_rate/sample/sample.c   Sat Aug  8 00:57:27 2015
(r286436)
+++ head/sys/dev/ath/ath_rate/sample/sample.c   Sat Aug  8 01:10:17 2015
(r286437)
@@ -488,7 +488,8 @@ ath_rate_findrate(struct ath_softc *sc, 
 #defineRATE(ix)(DOT11RATE(ix) / 2)
struct sample_node *sn = ATH_NODE_SAMPLE(an);
struct sample_softc *ssc = ATH_SOFTC_SAMPLE(sc);
-   struct ieee80211com *ic = sc-sc_ic;
+   struct ifnet *ifp = sc-sc_ifp;
+   struct ieee80211com *ic = ifp-if_l2com;
const HAL_RATE_TABLE *rt = sc-sc_currates;
const int size_bin = size_to_bin(frameLen);
int rix, mrr, best_rix, change_rates;
@@ -855,7 +856,8 @@ ath_rate_tx_complete(struct ath_softc *s
const struct ath_rc_series *rc, const struct ath_tx_status *ts,
int frame_size, int nframes, int nbad)
 {
-   struct ieee80211com *ic = sc-sc_ic;
+   struct ifnet *ifp = sc-sc_ifp;
+   struct ieee80211com *ic = ifp-if_l2com;
struct sample_node *sn = ATH_NODE_SAMPLE(an);
int final_rix, short_tries, long_tries;
const HAL_RATE_TABLE *rt = sc-sc_currates;
@@ -1301,7 +1303,8 @@ static int
 ath_rate_sysctl_stats(SYSCTL_HANDLER_ARGS)
 {
struct ath_softc *sc = arg1;
-   struct ieee80211com *ic = sc-sc_ic;
+   struct ifnet *ifp = sc-sc_ifp;
+   struct ieee80211com *ic = ifp-if_l2com;
int error, v;
 
v = 0;

Modified: head/sys/dev/ath/ath_rate/sample/sample.h
==
--- head/sys/dev/ath/ath_rate/sample/sample.h   Sat Aug  8 00:57:27 2015
(r286436)
+++ head/sys/dev/ath/ath_rate/sample/sample.h   Sat Aug  8 01:10:17 2015
(r286437)
@@ -134,7 +134,8 @@ static unsigned calc_usecs_unicast_packe
int long_retries, int is_ht40)
 {
const