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

Merge tag 'linux-can-fixes-for-4.2-20150715' of... 

Merge tag 'linux-can-fixes-for-4.2-20150715' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can



Marc Kleine-Budde says:

====================
pull-request: can 2015-07-15

this is a pull request of 12 patches by me.

This series fixes the use of the skb after netif_receive_skb() / netif_rx()
which exists in several drivers.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 03645a11 1c0ee046

drivers/net/can/at91_can.c

+4 −4
Original line number Diff line number Diff line
@@ -577,10 +577,10 @@ static void at91_rx_overflow_err(struct net_device *dev) 


	cf->can_id |= CAN_ERR_CRTL;

	cf->data[1] = CAN_ERR_CRTL_RX_OVERFLOW;

	netif_receive_skb(skb);



	stats->rx_packets++;

	stats->rx_bytes += cf->can_dlc;

	netif_receive_skb(skb);

}



/**
@@ -642,10 +642,10 @@ static void at91_read_msg(struct net_device *dev, unsigned int mb) 
	}



	at91_read_mb(dev, mb, cf);

	netif_receive_skb(skb);



	stats->rx_packets++;

	stats->rx_bytes += cf->can_dlc;

	netif_receive_skb(skb);



	can_led_event(dev, CAN_LED_EVENT_RX);

}
@@ -802,10 +802,10 @@ static int at91_poll_err(struct net_device *dev, int quota, u32 reg_sr) 
		return 0;



	at91_poll_err_frame(dev, cf, reg_sr);

	netif_receive_skb(skb);



	dev->stats.rx_packets++;

	dev->stats.rx_bytes += cf->can_dlc;

	netif_receive_skb(skb);



	return 1;

}
@@ -1067,10 +1067,10 @@ static void at91_irq_err(struct net_device *dev) 
		return;



	at91_irq_err_state(dev, cf, new_state);

	netif_rx(skb);



	dev->stats.rx_packets++;

	dev->stats.rx_bytes += cf->can_dlc;

	netif_rx(skb);



	priv->can.state = new_state;

}

drivers/net/can/bfin_can.c

+2 −4
Original line number Diff line number Diff line
@@ -424,10 +424,9 @@ static void bfin_can_rx(struct net_device *dev, u16 isrc) 
		cf->data[6 - i] = (6 - i) < cf->can_dlc ? (val >> 8) : 0;

	}



	netif_rx(skb);



	stats->rx_packets++;

	stats->rx_bytes += cf->can_dlc;

	netif_rx(skb);

}



static int bfin_can_err(struct net_device *dev, u16 isrc, u16 status)
@@ -508,10 +507,9 @@ static int bfin_can_err(struct net_device *dev, u16 isrc, u16 status) 


	priv->can.state = state;



	netif_rx(skb);



	stats->rx_packets++;

	stats->rx_bytes += cf->can_dlc;

	netif_rx(skb);



	return 0;

}

drivers/net/can/cc770/cc770.c

+2 −2
Original line number Diff line number Diff line
@@ -504,10 +504,10 @@ static void cc770_rx(struct net_device *dev, unsigned int mo, u8 ctrl1) 
		for (i = 0; i < cf->can_dlc; i++)

			cf->data[i] = cc770_read_reg(priv, msgobj[mo].data[i]);

	}

	netif_rx(skb);



	stats->rx_packets++;

	stats->rx_bytes += cf->can_dlc;

	netif_rx(skb);

}



static int cc770_err(struct net_device *dev, u8 status)
@@ -584,10 +584,10 @@ static int cc770_err(struct net_device *dev, u8 status) 
		}

	}



	netif_rx(skb);



	stats->rx_packets++;

	stats->rx_bytes += cf->can_dlc;

	netif_rx(skb);



	return 0;

}

drivers/net/can/flexcan.c

+3 −4
Original line number Diff line number Diff line
@@ -577,10 +577,10 @@ static int flexcan_poll_bus_err(struct net_device *dev, u32 reg_esr) 
		return 0;



	do_bus_err(dev, cf, reg_esr);

	netif_receive_skb(skb);



	dev->stats.rx_packets++;

	dev->stats.rx_bytes += cf->can_dlc;

	netif_receive_skb(skb);



	return 1;

}
@@ -622,10 +622,9 @@ static int flexcan_poll_state(struct net_device *dev, u32 reg_esr) 
	if (unlikely(new_state == CAN_STATE_BUS_OFF))

		can_bus_off(dev);



	netif_receive_skb(skb);



	dev->stats.rx_packets++;

	dev->stats.rx_bytes += cf->can_dlc;

	netif_receive_skb(skb);



	return 1;

}
@@ -670,10 +669,10 @@ static int flexcan_read_frame(struct net_device *dev) 
	}



	flexcan_read_fifo(dev, cf);

	netif_receive_skb(skb);



	stats->rx_packets++;

	stats->rx_bytes += cf->can_dlc;

	netif_receive_skb(skb);



	can_led_event(dev, CAN_LED_EVENT_RX);

drivers/net/can/grcan.c

+2 −1
Original line number Diff line number Diff line
@@ -1216,11 +1216,12 @@ static int grcan_receive(struct net_device *dev, int budget) 
				cf->data[i] = (u8)(slot[j] >> shift);

			}

		}

		netif_receive_skb(skb);



		/* Update statistics and read pointer */

		stats->rx_packets++;

		stats->rx_bytes += cf->can_dlc;

		netif_receive_skb(skb);



		rd = grcan_ring_add(rd, GRCAN_MSG_SIZE, dma->rx.size);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE