Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9ad99a6 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

parents c736eefa f792af25

drivers/net/wireless/ath/ath9k/recv.c

+2 −2
Original line number Diff line number Diff line
@@ -844,9 +844,9 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp) 
	int dma_type;



	if (edma)

		dma_type = DMA_FROM_DEVICE;

	else

		dma_type = DMA_BIDIRECTIONAL;

	else

		dma_type = DMA_FROM_DEVICE;



	qtype = hp ? ATH9K_RX_QUEUE_HP : ATH9K_RX_QUEUE_LP;

	spin_lock_bh(&sc->rx.rxbuflock);

net/mac80211/cfg.c

+1 −1
Original line number Diff line number Diff line
@@ -632,7 +632,7 @@ static void ieee80211_send_layer2_update(struct sta_info *sta) 
	skb->dev = sta->sdata->dev;

	skb->protocol = eth_type_trans(skb, sta->sdata->dev);

	memset(skb->cb, 0, sizeof(skb->cb));

	netif_rx(skb);

	netif_rx_ni(skb);

}



static void sta_apply_parameters(struct ieee80211_local *local,