From 9cf5c2f51ac89412ad5a3819a704858aaad5170d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= Date: Sun, 2 Sep 2012 23:20:32 +0000 Subject: [PATCH] --- yaml --- r: 327767 b: refs/heads/master c: 9625e5fa345f079c92ce34dd564196e7dc45461b h: refs/heads/master i: 327765: db40e1586344f565aad0b53c3f800e78a29a60cc 327763: bcdbb10abd2f1f4786d88d63a5f395d1e7e658e5 327759: 3e4a83bb59b996f77795cb2074f229772dc1b8b9 v: v3 --- [refs] | 2 +- trunk/drivers/net/usb/sierra_net.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d0b100a1c996..3429cac3d771 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 11ad714b98f6d9ca0067568442afe3e70eb94845 +refs/heads/master: 9625e5fa345f079c92ce34dd564196e7dc45461b diff --git a/trunk/drivers/net/usb/sierra_net.c b/trunk/drivers/net/usb/sierra_net.c index 7be49ea60b6d..596ddaaa3704 100644 --- a/trunk/drivers/net/usb/sierra_net.c +++ b/trunk/drivers/net/usb/sierra_net.c @@ -560,7 +560,7 @@ static void sierra_net_defer_kevent(struct usbnet *dev, int work) /* * Sync Retransmit Timer Handler. On expiry, kick the work queue */ -void sierra_sync_timer(unsigned long syncdata) +static void sierra_sync_timer(unsigned long syncdata) { struct usbnet *dev = (struct usbnet *)syncdata; @@ -866,8 +866,8 @@ static int sierra_net_rx_fixup(struct usbnet *dev, struct sk_buff *skb) } /* ---------------------------- Transmit data path ----------------------*/ -struct sk_buff *sierra_net_tx_fixup(struct usbnet *dev, struct sk_buff *skb, - gfp_t flags) +static struct sk_buff *sierra_net_tx_fixup(struct usbnet *dev, + struct sk_buff *skb, gfp_t flags) { struct sierra_net_data *priv = sierra_net_get_private(dev); u16 len;