Merge branch 'for-next' into for-linus
Conflicts: kernel/irq/chip.c
このコミットが含まれているのは:
Jiri Kosina
@@ -36,7 +36,7 @@
|
||||
*/
|
||||
|
||||
/*
|
||||
* Defintions for the Atheros Wireless LAN controller driver.
|
||||
* Definitions for the Atheros Wireless LAN controller driver.
|
||||
*/
|
||||
#ifndef _DEV_ATH_ATHVAR_H
|
||||
#define _DEV_ATH_ATHVAR_H
|
||||
@@ -193,7 +193,7 @@ struct ath5k_softc {
|
||||
struct ath5k_txq *cabq; /* content after beacon */
|
||||
|
||||
int power_level; /* Requested tx power in dbm */
|
||||
bool assoc; /* assocate state */
|
||||
bool assoc; /* associate state */
|
||||
bool enable_beacon; /* true if beacons are on */
|
||||
};
|
||||
|
||||
|
||||
@@ -1492,7 +1492,7 @@ ath5k_eeprom_read_target_rate_pwr_info(struct ath5k_hw *ah, unsigned int mode)
|
||||
* This info is used to calibrate the baseband power table. Imagine
|
||||
* that for each channel there is a power curve that's hw specific
|
||||
* (depends on amplifier etc) and we try to "correct" this curve using
|
||||
* offests we pass on to phy chip (baseband -> before amplifier) so that
|
||||
* offsets we pass on to phy chip (baseband -> before amplifier) so that
|
||||
* it can use accurate power values when setting tx power (takes amplifier's
|
||||
* performance on each channel into account).
|
||||
*
|
||||
|
||||
@@ -117,7 +117,7 @@ static unsigned int ath5k_hw_rfb_op(struct ath5k_hw *ah,
|
||||
|
||||
/*
|
||||
* This code is used to optimize rf gain on different environments
|
||||
* (temprature mostly) based on feedback from a power detector.
|
||||
* (temperature mostly) based on feedback from a power detector.
|
||||
*
|
||||
* It's only used on RF5111 and RF5112, later RF chips seem to have
|
||||
* auto adjustment on hw -notice they have a much smaller BANK 7 and
|
||||
@@ -2675,7 +2675,7 @@ ath5k_setup_channel_powertable(struct ath5k_hw *ah,
|
||||
/* Fill curves in reverse order
|
||||
* from lower power (max gain)
|
||||
* to higher power. Use curve -> idx
|
||||
* backmaping we did on eeprom init */
|
||||
* backmapping we did on eeprom init */
|
||||
u8 idx = pdg_curve_to_idx[pdg];
|
||||
|
||||
/* Grab the needed curves by index */
|
||||
@@ -2777,7 +2777,7 @@ ath5k_setup_channel_powertable(struct ath5k_hw *ah,
|
||||
/* Now we have a set of curves for this
|
||||
* channel on tmpL (x range is table_max - table_min
|
||||
* and y values are tmpL[pdg][]) sorted in the same
|
||||
* order as EEPROM (because we've used the backmaping).
|
||||
* order as EEPROM (because we've used the backmapping).
|
||||
* So for RF5112 it's from higher power to lower power
|
||||
* and for RF2413 it's from lower power to higher power.
|
||||
* For RF5111 we only have one curve. */
|
||||
|
||||
@@ -969,7 +969,7 @@ static bool ath_rc_update_per(struct ath_softc *sc,
|
||||
* Since this probe succeeded, we allow the next
|
||||
* probe twice as soon. This allows the maxRate
|
||||
* to move up faster if the probes are
|
||||
* succesful.
|
||||
* successful.
|
||||
*/
|
||||
ath_rc_priv->probe_time =
|
||||
now_msec - rate_table->probe_interval / 2;
|
||||
|
||||
@@ -2955,7 +2955,7 @@ static void do_periodic_work(struct b43_wldev *dev)
|
||||
/* Periodic work locking policy:
|
||||
* The whole periodic work handler is protected by
|
||||
* wl->mutex. If another lock is needed somewhere in the
|
||||
* pwork callchain, it's aquired in-place, where it's needed.
|
||||
* pwork callchain, it's acquired in-place, where it's needed.
|
||||
*/
|
||||
static void b43_periodic_work_handler(struct work_struct *work)
|
||||
{
|
||||
|
||||
@@ -2277,7 +2277,7 @@ static void do_periodic_work(struct b43legacy_wldev *dev)
|
||||
/* Periodic work locking policy:
|
||||
* The whole periodic work handler is protected by
|
||||
* wl->mutex. If another lock is needed somewhere in the
|
||||
* pwork callchain, it's aquired in-place, where it's needed.
|
||||
* pwork callchain, it's acquired in-place, where it's needed.
|
||||
*/
|
||||
static void b43legacy_periodic_work_handler(struct work_struct *work)
|
||||
{
|
||||
|
||||
@@ -551,7 +551,7 @@ static int ipw2100_get_ordinal(struct ipw2100_priv *priv, u32 ord,
|
||||
/* get number of entries */
|
||||
field_count = *(((u16 *) & field_info) + 1);
|
||||
|
||||
/* abort if no enought memory */
|
||||
/* abort if no enough memory */
|
||||
total_length = field_len * field_count;
|
||||
if (total_length > *len) {
|
||||
*len = total_length;
|
||||
@@ -3044,7 +3044,7 @@ static void ipw2100_tx_send_data(struct ipw2100_priv *priv)
|
||||
IPW_MAX_BDS)) {
|
||||
/* TODO: Support merging buffers if more than
|
||||
* IPW_MAX_BDS are used */
|
||||
IPW_DEBUG_INFO("%s: Maximum BD theshold exceeded. "
|
||||
IPW_DEBUG_INFO("%s: Maximum BD threshold exceeded. "
|
||||
"Increase fragmentation level.\n",
|
||||
priv->net_dev->name);
|
||||
}
|
||||
@@ -6820,7 +6820,7 @@ static int ipw2100_wx_get_range(struct net_device *dev,
|
||||
range->max_qual.updated = 7; /* Updated all three */
|
||||
|
||||
range->avg_qual.qual = 70; /* > 8% missed beacons is 'bad' */
|
||||
/* TODO: Find real 'good' to 'bad' threshol value for RSSI */
|
||||
/* TODO: Find real 'good' to 'bad' threshold value for RSSI */
|
||||
range->avg_qual.level = 20 + IPW2100_RSSI_TO_DBM;
|
||||
range->avg_qual.noise = 0;
|
||||
range->avg_qual.updated = 7; /* Updated all three */
|
||||
|
||||
@@ -768,7 +768,7 @@ static int ipw_get_ordinal(struct ipw_priv *priv, u32 ord, void *val, u32 * len)
|
||||
/* get number of entries */
|
||||
field_count = *(((u16 *) & field_info) + 1);
|
||||
|
||||
/* abort if not enought memory */
|
||||
/* abort if not enough memory */
|
||||
total_len = field_len * field_count;
|
||||
if (total_len > *len) {
|
||||
*len = total_len;
|
||||
@@ -7732,7 +7732,7 @@ static void ipw_rebuild_decrypted_skb(struct ipw_priv *priv,
|
||||
case SEC_LEVEL_0:
|
||||
break;
|
||||
default:
|
||||
printk(KERN_ERR "Unknow security level %d\n",
|
||||
printk(KERN_ERR "Unknown security level %d\n",
|
||||
priv->ieee->sec.level);
|
||||
break;
|
||||
}
|
||||
@@ -8916,7 +8916,7 @@ static int ipw_wx_get_range(struct net_device *dev,
|
||||
range->max_qual.updated = 7; /* Updated all three */
|
||||
|
||||
range->avg_qual.qual = 70;
|
||||
/* TODO: Find real 'good' to 'bad' threshol value for RSSI */
|
||||
/* TODO: Find real 'good' to 'bad' threshold value for RSSI */
|
||||
range->avg_qual.level = 0; /* FIXME to real average level */
|
||||
range->avg_qual.noise = 0;
|
||||
range->avg_qual.updated = 7; /* Updated all three */
|
||||
@@ -10289,7 +10289,7 @@ static int ipw_tx_skb(struct ipw_priv *priv, struct libipw_txb *txb,
|
||||
case SEC_LEVEL_0:
|
||||
break;
|
||||
default:
|
||||
printk(KERN_ERR "Unknow security level %d\n",
|
||||
printk(KERN_ERR "Unknown security level %d\n",
|
||||
priv->ieee->sec.level);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -175,7 +175,7 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
|
||||
ieee->host_decrypt = 1;
|
||||
ieee->host_mc_decrypt = 1;
|
||||
|
||||
/* Host fragementation in Open mode. Default is enabled.
|
||||
/* Host fragmentation in Open mode. Default is enabled.
|
||||
* Note: host fragmentation is always enabled if host encryption
|
||||
* is enabled. For cards can do hardware encryption, they must do
|
||||
* hardware fragmentation as well. So we don't need a variable
|
||||
|
||||
@@ -411,7 +411,7 @@ static void iwm_build_lmac_hdr(struct iwm_priv *iwm, struct iwm_lmac_hdr *hdr,
|
||||
/*
|
||||
* iwm_hal_send_host_cmd(): sends commands to the UMAC or the LMAC.
|
||||
* Sending command to the LMAC is equivalent to sending a
|
||||
* regular UMAC command with the LMAC passtrough or the LMAC
|
||||
* regular UMAC command with the LMAC passthrough or the LMAC
|
||||
* wrapper UMAC command IDs.
|
||||
*/
|
||||
int iwm_hal_send_host_cmd(struct iwm_priv *iwm,
|
||||
|
||||
@@ -1448,7 +1448,7 @@ static void iwm_rx_process_packet(struct iwm_priv *iwm,
|
||||
kfree_skb(packet->skb);
|
||||
break;
|
||||
default:
|
||||
IWM_ERR(iwm, "Unknow ticket action: %d\n",
|
||||
IWM_ERR(iwm, "Unknown ticket action: %d\n",
|
||||
le16_to_cpu(ticket_node->ticket->action));
|
||||
kfree_skb(packet->skb);
|
||||
}
|
||||
|
||||
@@ -934,7 +934,7 @@ static int if_sdio_probe(struct sdio_func *func,
|
||||
}
|
||||
|
||||
if (i == ARRAY_SIZE(if_sdio_models)) {
|
||||
lbs_pr_err("unkown card model 0x%x\n", card->model);
|
||||
lbs_pr_err("unknown card model 0x%x\n", card->model);
|
||||
ret = -ENODEV;
|
||||
goto free;
|
||||
}
|
||||
|
||||
@@ -550,7 +550,7 @@ static const struct { \
|
||||
|
||||
#define DEFAULT_PDR(pid) default_pdr_data_##pid
|
||||
|
||||
/* HWIF Compatiblity */
|
||||
/* HWIF Compatibility */
|
||||
DEFINE_DEFAULT_PDR(0x0005, 10, "\x00\x00\x06\x00\x01\x00\x01\x00\x01\x00");
|
||||
|
||||
/* PPPPSign */
|
||||
@@ -656,7 +656,7 @@ int hermes_apply_pda_with_defaults(hermes_t *hw,
|
||||
record_id + 1, pdi);
|
||||
}
|
||||
break;
|
||||
case 0x5: /* HWIF Compatiblity */
|
||||
case 0x5: /* HWIF Compatibility */
|
||||
default_pdi = (struct pdi *) &DEFAULT_PDR(0x0005);
|
||||
break;
|
||||
case 0x108: /* PPPPSign */
|
||||
|
||||
@@ -1897,7 +1897,7 @@ prism54_get_mac(struct net_device *ndev, struct iw_request_info *info,
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Setting policy also clears the MAC acl, even if we don't change the defaut
|
||||
/* Setting policy also clears the MAC acl, even if we don't change the default
|
||||
* policy
|
||||
*/
|
||||
|
||||
@@ -2323,7 +2323,7 @@ prism54_process_trap_helper(islpci_private *priv, enum oid_num_t oid,
|
||||
|
||||
case DOT11_OID_BEACON:
|
||||
send_formatted_event(priv,
|
||||
"Received a beacon from an unkown AP",
|
||||
"Received a beacon from an unknown AP",
|
||||
mlme, 0);
|
||||
break;
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
/*
|
||||
* Signal information.
|
||||
* Defaul offset is required for RSSI <-> dBm conversion.
|
||||
* Default offset is required for RSSI <-> dBm conversion.
|
||||
*/
|
||||
#define DEFAULT_RSSI_OFFSET 100
|
||||
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
|
||||
/*
|
||||
* Signal information.
|
||||
* Defaul offset is required for RSSI <-> dBm conversion.
|
||||
* Default offset is required for RSSI <-> dBm conversion.
|
||||
*/
|
||||
#define DEFAULT_RSSI_OFFSET 121
|
||||
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
|
||||
/*
|
||||
* Signal information.
|
||||
* Defaul offset is required for RSSI <-> dBm conversion.
|
||||
* Default offset is required for RSSI <-> dBm conversion.
|
||||
*/
|
||||
#define DEFAULT_RSSI_OFFSET 120
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
|
||||
/*
|
||||
* Signal information.
|
||||
* Defaul offset is required for RSSI <-> dBm conversion.
|
||||
* Default offset is required for RSSI <-> dBm conversion.
|
||||
*/
|
||||
#define DEFAULT_RSSI_OFFSET 120
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
|
||||
/*
|
||||
* Signal information.
|
||||
* Defaul offset is required for RSSI <-> dBm conversion.
|
||||
* Default offset is required for RSSI <-> dBm conversion.
|
||||
*/
|
||||
#define DEFAULT_RSSI_OFFSET 120
|
||||
|
||||
|
||||
@@ -3987,7 +3987,7 @@ wavelan_interrupt(int irq,
|
||||
#endif
|
||||
|
||||
/* Prevent reentrancy. We need to do that because we may have
|
||||
* multiple interrupt handler running concurently.
|
||||
* multiple interrupt handler running concurrently.
|
||||
* It is safe because interrupts are disabled before aquiring
|
||||
* the spinlock. */
|
||||
spin_lock(&lp->spinlock);
|
||||
|
||||
@@ -312,7 +312,7 @@ static void tx_status(struct ieee80211_hw *hw, struct sk_buff *skb,
|
||||
* zd_mac_tx_failed - callback for failed frames
|
||||
* @dev: the mac80211 wireless device
|
||||
*
|
||||
* This function is called if a frame couldn't be succesfully be
|
||||
* This function is called if a frame couldn't be successfully be
|
||||
* transferred. The first frame from the tx queue, will be selected and
|
||||
* reported as error to the upper layers.
|
||||
*/
|
||||
|
||||
新しいイシューから参照
ユーザーをブロックする