Skip to content

Commit

Permalink
a2065: skb_padto cleanups
Browse files Browse the repository at this point in the history
Remove unnecessary check (skb_padto does the same check)
Remove unnecessary duplicate variable
Remove unnecessary clearing of padded part of skb.

Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Dave Jones authored and David S. Miller committed Mar 19, 2009
1 parent af43306 commit cedc1db
Showing 1 changed file with 5 additions and 14 deletions.
19 changes: 5 additions & 14 deletions drivers/net/a2065.c
Original file line number Diff line number Diff line change
Expand Up @@ -552,18 +552,13 @@ static int lance_start_xmit (struct sk_buff *skb, struct net_device *dev)
struct lance_private *lp = netdev_priv(dev);
volatile struct lance_regs *ll = lp->ll;
volatile struct lance_init_block *ib = lp->init_block;
int entry, skblen, len;
int entry, skblen;
int status = 0;
unsigned long flags;

skblen = skb->len;
len = skblen;

if (len < ETH_ZLEN) {
len = ETH_ZLEN;
if (skb_padto(skb, ETH_ZLEN))
return 0;
}
if (skb_padto(skb, ETH_ZLEN))
return 0;
skblen = max_t(unsigned, skb->len, ETH_ZLEN);

local_irq_save(flags);

Expand All @@ -586,15 +581,11 @@ static int lance_start_xmit (struct sk_buff *skb, struct net_device *dev)
}
#endif
entry = lp->tx_new & lp->tx_ring_mod_mask;
ib->btx_ring [entry].length = (-len) | 0xf000;
ib->btx_ring [entry].length = (-skblen) | 0xf000;
ib->btx_ring [entry].misc = 0;

skb_copy_from_linear_data(skb, (void *)&ib->tx_buf [entry][0], skblen);

/* Clear the slack of the packet, do I need this? */
if (len != skblen)
memset ((void *) &ib->tx_buf [entry][skblen], 0, len - skblen);

/* Now, give the packet to the lance */
ib->btx_ring [entry].tmd1_bits = (LE_T1_POK|LE_T1_OWN);
lp->tx_new = (lp->tx_new+1) & lp->tx_ring_mod_mask;
Expand Down

0 comments on commit cedc1db

Please sign in to comment.