> --- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
> @@ -1253,8 +1253,7 @@ void iwlagn_hwrate_to_tx_control(struct iwl_priv *priv,
> u32 rate_n_flags,
> * Handles block-acknowledge notification from device, which reports success
> * of frames sent via aggregation.
> */
> -void iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,
> - struct iwl_rx_mem_buffer *rxb)
> +void iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv, struct
> iwl_rx_mem_buffer *rxb)
> {
> struct iwl_rx_packet *pkt = rxb_addr(rxb);
> struct iwl_compressed_ba_resp *ba_resp = &pkt->u.compressed_ba;
Useless hunk that only reformats code.
> diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
> index e8f3545..43088fe 100644
> --- a/net/mac80211/cfg.c
> +++ b/net/mac80211/cfg.c
> @@ -1221,6 +1221,7 @@ static int ieee80211_scan(struct wiphy *wiphy,
>
> sdata = IEEE80211_DEV_TO_SUB_IF(dev);
>
> + if
> if (sdata->vif.type != NL80211_IFTYPE_STATION &&
> sdata->vif.type != NL80211_IFTYPE_ADHOC &&
> sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
Stray "if" with no conditional?
> diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
> index 090b3e6..e716b9e 100644
> --- a/net/mac80211/mlme.c
> +++ b/net/mac80211/mlme.c
> @@ -2407,10 +2407,8 @@ int ieee80211_mgd_action(struct ieee80211_sub_if_data
> *sdata,
> struct sk_buff *skb;
>
> /* Check that we are on the requested channel for transmission */
> - if ((chan != local->tmp_channel ||
> - channel_type != local->tmp_channel_type) &&
> - (chan != local->oper_channel ||
> - channel_type != local->_oper_channel_type))
> + if ((chan != local->tmp_channel || channel_type !=
> local->tmp_channel_type) &&
> + (chan != local->oper_channel || channel_type !=
> local->_oper_channel_type))
> return -EBUSY;
>
> skb = dev_alloc_skb(local->hw.extra_tx_headroom + len);
Useless hunk that only reformats code.
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
