|
@@ -223,9 +223,9 @@ static void ravb_ring_free(struct net_device *ndev, int q)
|
|
static void ravb_ring_format(struct net_device *ndev, int q)
|
|
static void ravb_ring_format(struct net_device *ndev, int q)
|
|
{
|
|
{
|
|
struct ravb_private *priv = netdev_priv(ndev);
|
|
struct ravb_private *priv = netdev_priv(ndev);
|
|
- struct ravb_ex_rx_desc *rx_desc = NULL;
|
|
|
|
- struct ravb_tx_desc *tx_desc = NULL;
|
|
|
|
- struct ravb_desc *desc = NULL;
|
|
|
|
|
|
+ struct ravb_ex_rx_desc *rx_desc;
|
|
|
|
+ struct ravb_tx_desc *tx_desc;
|
|
|
|
+ struct ravb_desc *desc;
|
|
int rx_ring_size = sizeof(*rx_desc) * priv->num_rx_ring[q];
|
|
int rx_ring_size = sizeof(*rx_desc) * priv->num_rx_ring[q];
|
|
int tx_ring_size = sizeof(*tx_desc) * priv->num_tx_ring[q];
|
|
int tx_ring_size = sizeof(*tx_desc) * priv->num_tx_ring[q];
|
|
struct sk_buff *skb;
|
|
struct sk_buff *skb;
|
|
@@ -435,7 +435,7 @@ static int ravb_tx_free(struct net_device *ndev, int q)
|
|
struct net_device_stats *stats = &priv->stats[q];
|
|
struct net_device_stats *stats = &priv->stats[q];
|
|
struct ravb_tx_desc *desc;
|
|
struct ravb_tx_desc *desc;
|
|
int free_num = 0;
|
|
int free_num = 0;
|
|
- int entry = 0;
|
|
|
|
|
|
+ int entry;
|
|
u32 size;
|
|
u32 size;
|
|
|
|
|
|
for (; priv->cur_tx[q] - priv->dirty_tx[q] > 0; priv->dirty_tx[q]++) {
|
|
for (; priv->cur_tx[q] - priv->dirty_tx[q] > 0; priv->dirty_tx[q]++) {
|
|
@@ -508,8 +508,8 @@ static bool ravb_rx(struct net_device *ndev, int *quota, int q)
|
|
struct sk_buff *skb;
|
|
struct sk_buff *skb;
|
|
dma_addr_t dma_addr;
|
|
dma_addr_t dma_addr;
|
|
struct timespec64 ts;
|
|
struct timespec64 ts;
|
|
- u16 pkt_len = 0;
|
|
|
|
u8 desc_status;
|
|
u8 desc_status;
|
|
|
|
+ u16 pkt_len;
|
|
int limit;
|
|
int limit;
|
|
|
|
|
|
boguscnt = min(boguscnt, *quota);
|
|
boguscnt = min(boguscnt, *quota);
|
|
@@ -1272,8 +1272,8 @@ static void ravb_tx_timeout_work(struct work_struct *work)
|
|
static netdev_tx_t ravb_start_xmit(struct sk_buff *skb, struct net_device *ndev)
|
|
static netdev_tx_t ravb_start_xmit(struct sk_buff *skb, struct net_device *ndev)
|
|
{
|
|
{
|
|
struct ravb_private *priv = netdev_priv(ndev);
|
|
struct ravb_private *priv = netdev_priv(ndev);
|
|
- struct ravb_tstamp_skb *ts_skb = NULL;
|
|
|
|
u16 q = skb_get_queue_mapping(skb);
|
|
u16 q = skb_get_queue_mapping(skb);
|
|
|
|
+ struct ravb_tstamp_skb *ts_skb;
|
|
struct ravb_tx_desc *desc;
|
|
struct ravb_tx_desc *desc;
|
|
unsigned long flags;
|
|
unsigned long flags;
|
|
u32 dma_addr;
|
|
u32 dma_addr;
|