#include "ath9k.h"
static char *dev_info = "ath9k";
-@@ -557,6 +558,8 @@ static int ath9k_init_softc(u16 devid, s
+@@ -553,6 +554,8 @@ static int ath9k_init_softc(u16 devid, s
pdata = (struct ath9k_platform_data *) sc->dev->platform_data;
if (!pdata)
ah->ah_flags |= AH_USE_EEPROM;
common = ath9k_hw_common(ah);
common->ops = &ath9k_common_ops;
-@@ -679,6 +682,24 @@ void ath9k_set_hw_capab(struct ath_softc
+@@ -675,6 +678,24 @@ void ath9k_set_hw_capab(struct ath_softc
SET_IEEE80211_PERM_ADDR(hw, common->macaddr);
}
int ath9k_init_device(u16 devid, struct ath_softc *sc, u16 subsysid,
const struct ath_bus_ops *bus_ops)
{
-@@ -697,6 +718,9 @@ int ath9k_init_device(u16 devid, struct
+@@ -693,6 +714,9 @@ int ath9k_init_device(u16 devid, struct
common = ath9k_hw_common(ah);
ath9k_set_hw_capab(sc, hw);
ath9k_reg_notifier);
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -517,6 +517,8 @@ struct ath_softc {
+@@ -596,6 +596,8 @@ struct ath_softc {
int beacon_interval;