Attachment #123205 for bug #182795

Lines 209-215 Link Here

(-)madwifi-hal-0.9.30.13-r2323-20070512.old/ath/if_ath_pci.c (-1 / +1 lines)
209		209
210	pci_set_drvdata(pdev, dev);	210	pci_set_drvdata(pdev, dev);
211		211
212	if (request_irq(dev->irq, ath_intr, SA_SHIRQ, dev->name, dev)) {	212	if (request_irq(dev->irq, ath_intr, IRQF_SHARED, dev->name, dev)) {
213	printk(KERN_WARNING "%s: request_irq failed\n", dev->name);	213	printk(KERN_WARNING "%s: request_irq failed\n", dev->name);
214	goto bad3;	214	goto bad3;
215	}	215	}




		}
		if (skb1 != NULL) {
			skb1->dev = dev;
			skb1->mac_header = skb1->data;
			skb1->network_header = skb1->data + sizeof(struct ether_header);
			skb1->protocol = __constant_htons(ETH_P_802_2);
			/* XXX insert vlan tag before queue it? */
			dev_queue_xmit(skb1);

		if (skb1 == NULL)
			return;
		skb1->dev = dev;
		skb1->mac_header = skb1->data;
		skb1->ip_summed = CHECKSUM_NONE;
		skb1->pkt_type = PACKET_OTHERHOST;
		skb1->protocol = __constant_htons(0x0019);  /* ETH_P_80211_RAW */

	 * constants instead. We know the packet type anyway. */
	skb->pkt_type = PACKET_BROADCAST;
	skb->protocol = htons(ETH_P_802_2);
	skb->mac_header = skb->data;
	ieee80211_deliver_data(ni, skb);
	return;
}

{
	struct ethhdr *eth;
	
	skb->mac_header=skb->data;
	skb_pull(skb, ETH_HLEN);
	/*
	 * NB: mac.ethernet is replaced in 2.6.9 by eth_hdr but
	 *     since that's an inline and not a define there's
	 *     no easy way to do this cleanly.
	 */
	eth = (struct ethhdr *)skb->mac_header;
	
	if (*eth->h_dest & 1)
		if (memcmp(eth->h_dest, dev->broadcast, ETH_ALEN) == 0)

Lines 379-385 Link Here

(-)madwifi-hal-0.9.30.13-r2323-20070512.old/net80211/ieee80211_monitor.c (-2 / +2 lines)
379	if (vap->iv_monitor_txf_len && tx) {	379	if (vap->iv_monitor_txf_len && tx) {
380	/* truncate transmit feedback packets */	380	/* truncate transmit feedback packets */
381	skb_trim(skb1, vap->iv_monitor_txf_len);	381	skb_trim(skb1, vap->iv_monitor_txf_len);
382	skb1->nh.raw = skb1->data;	382	skb1->network_header = skb1->data;
383	}	383	}
384	switch (vap->iv_dev->type) {	384	switch (vap->iv_dev->type) {
385	case ARPHRD_IEEE80211:	385	case ARPHRD_IEEE80211:
Lines 563-569 Link Here
563	skb_trim(skb1, skb1->len - IEEE80211_CRC_LEN);	563	skb_trim(skb1, skb1->len - IEEE80211_CRC_LEN);
564	}	564	}
565	skb1->dev = dev; /* NB: deliver to wlanX */	565	skb1->dev = dev; /* NB: deliver to wlanX */
566	skb1->mac.raw = skb1->data;	566	skb1->mac_header = skb1->data;
567	skb1->ip_summed = CHECKSUM_NONE;	567	skb1->ip_summed = CHECKSUM_NONE;
568	skb1->pkt_type = pkttype;	568	skb1->pkt_type = pkttype;
569	skb1->protocol = __constant_htons(0x0019); /* ETH_P_80211_RAW */	569	skb1->protocol = __constant_htons(0x0019); /* ETH_P_80211_RAW */

Return to bug 182795

Lines 1135-1142 Link Here

(-)madwifi-hal-0.9.30.13-r2323-20070512.old/net80211/ieee80211_input.c (-6 / +6 lines)
1135	}	1135	}
1136	if (skb1 != NULL) {	1136	if (skb1 != NULL) {
1137	skb1->dev = dev;	1137	skb1->dev = dev;
1138	skb1->mac.raw = skb1->data;	1138	skb1->mac_header = skb1->data;
1139	skb1->nh.raw = skb1->data + sizeof(struct ether_header);	1139	skb1->network_header = skb1->data + sizeof(struct ether_header);
1140	skb1->protocol = __constant_htons(ETH_P_802_2);	1140	skb1->protocol = __constant_htons(ETH_P_802_2);
1141	/* XXX insert vlan tag before queue it? */	1141	/* XXX insert vlan tag before queue it? */
1142	dev_queue_xmit(skb1);	1142	dev_queue_xmit(skb1);
Lines 2262-2268 Link Here
2262	if (skb1 == NULL)	2262	if (skb1 == NULL)
2263	return;	2263	return;
2264	skb1->dev = dev;	2264	skb1->dev = dev;
2265	skb1->mac.raw = skb1->data;	2265	skb1->mac_header = skb1->data;
2266	skb1->ip_summed = CHECKSUM_NONE;	2266	skb1->ip_summed = CHECKSUM_NONE;
2267	skb1->pkt_type = PACKET_OTHERHOST;	2267	skb1->pkt_type = PACKET_OTHERHOST;
2268	skb1->protocol = __constant_htons(0x0019); /* ETH_P_80211_RAW */	2268	skb1->protocol = __constant_htons(0x0019); /* ETH_P_80211_RAW */
Lines 2540-2546 Link Here
2540	* constants instead. We know the packet type anyway. */	2540	* constants instead. We know the packet type anyway. */
2541	skb->pkt_type = PACKET_BROADCAST;	2541	skb->pkt_type = PACKET_BROADCAST;
2542	skb->protocol = htons(ETH_P_802_2);	2542	skb->protocol = htons(ETH_P_802_2);
2543	skb->mac.raw = skb->data;	2543	skb->mac_header = skb->data;
2544	ieee80211_deliver_data(ni, skb);	2544	ieee80211_deliver_data(ni, skb);
2545	return;	2545	return;
2546	}	2546	}
Lines 3711-3724 Link Here
3711	{	3711	{
3712	struct ethhdr *eth;	3712	struct ethhdr *eth;
3713		3713
3714	skb->mac.raw=skb->data;	3714	skb->mac_header=skb->data;
3715	skb_pull(skb, ETH_HLEN);	3715	skb_pull(skb, ETH_HLEN);
3716	/*	3716	/*
3717	* NB: mac.ethernet is replaced in 2.6.9 by eth_hdr but	3717	* NB: mac.ethernet is replaced in 2.6.9 by eth_hdr but
3718	* since that's an inline and not a define there's	3718	* since that's an inline and not a define there's
3719	* no easy way to do this cleanly.	3719	* no easy way to do this cleanly.
3720	*/	3720	*/
3721	eth = (struct ethhdr *)skb->mac.raw;	3721	eth = (struct ethhdr *)skb->mac_header;
3722		3722
3723	if (*eth->h_dest & 1)	3723	if (*eth->h_dest & 1)
3724	if (memcmp(eth->h_dest, dev->broadcast, ETH_ALEN) == 0)	3724	if (memcmp(eth->h_dest, dev->broadcast, ETH_ALEN) == 0)