networking: convert many more places to skb_put_zero()

[linux-2.6-block.git] / drivers / net / usb / cdc_ncm.c

diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index bb3f71f9fbde06ef1a8d514dbb856c8aa7ff5130..7f02954772c6e39a5bd30a71bfd8b2151d49e62e 100644 (file)
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -1017,7 +1017,7 @@ static void cdc_ncm_align_tail(struct sk_buff *skb, size_t modulus, size_t remai
        if (skb->len + align > max)
                align = max - skb->len;
        if (align && skb_tailroom(skb) >= align)
-               memset(skb_put(skb, align), 0, align);
+               skb_put_zero(skb, align);
 }
 
 /* return a pointer to a valid struct usb_cdc_ncm_ndp16 of type sign, possibly
@@ -1088,6 +1088,7 @@ cdc_ncm_fill_tx_frame(struct usbnet *dev, struct sk_buff *skb, __le32 sign)
        u16 n = 0, index, ndplen;
        u8 ready2send = 0;
        u32 delayed_ndp_size;
+       size_t padding_count;
 
        /* When our NDP gets written in cdc_ncm_ndp(), then skb_out->len gets updated
         * accordingly. Otherwise, we should check here.
@@ -1244,11 +1245,13 @@ cdc_ncm_fill_tx_frame(struct usbnet *dev, struct sk_buff *skb, __le32 sign)
         * a ZLP after full sized NTBs.
         */
        if (!(dev->driver_info->flags & FLAG_SEND_ZLP) &&
-           skb_out->len > ctx->min_tx_pkt)
-               memset(skb_put(skb_out, ctx->tx_max - skb_out->len), 0,
-                      ctx->tx_max - skb_out->len);
-       else if (skb_out->len < ctx->tx_max && (skb_out->len % dev->maxpacket) == 0)
+           skb_out->len > ctx->min_tx_pkt) {
+               padding_count = ctx->tx_max - skb_out->len;
+               skb_put_zero(skb_out, padding_count);
+       } else if (skb_out->len < ctx->tx_max &&
+                  (skb_out->len % dev->maxpacket) == 0) {
                *skb_put(skb_out, 1) = 0;       /* force short packet */
+       }
 
        /* set final frame length */
        nth16 = (struct usb_cdc_ncm_nth16 *)skb_out->data;