From a19e91337171f006afb4adcaa12160907c18ae0b Mon Sep 17 00:00:00 2001 From: Eric Sesterhenn Date: Wed, 21 Jun 2006 16:10:48 +0200 Subject: [PATCH] --- yaml --- r: 28837 b: refs/heads/master c: da4f5ccf6040b998b64c60db8fa5f4ee03fdaf95 h: refs/heads/master i: 28835: 58c85e224ed32682ad680bf49de55156d17f9dcd v: v3 --- [refs] | 2 +- trunk/drivers/net/pcmcia/xirc2ps_cs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 934625a036cd..6188412dfcf5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 722fdb33591bc7308a661913fb2f829128236b6f +refs/heads/master: da4f5ccf6040b998b64c60db8fa5f4ee03fdaf95 diff --git a/trunk/drivers/net/pcmcia/xirc2ps_cs.c b/trunk/drivers/net/pcmcia/xirc2ps_cs.c index 71f45056a70c..e80d1e3aec68 100644 --- a/trunk/drivers/net/pcmcia/xirc2ps_cs.c +++ b/trunk/drivers/net/pcmcia/xirc2ps_cs.c @@ -1359,7 +1359,7 @@ do_start_xmit(struct sk_buff *skb, struct net_device *dev) kio_addr_t ioaddr = dev->base_addr; int okay; unsigned freespace; - unsigned pktlen = skb? skb->len : 0; + unsigned pktlen = skb->len; DEBUG(1, "do_start_xmit(skb=%p, dev=%p) len=%u\n", skb, dev, pktlen);