From 82abc14fac0643866f6de246c829351e85d59779 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Tue, 1 Mar 2011 22:40:57 -0800
Subject: [PATCH] --- yaml --- r: 235392 b: refs/heads/master c:
 45d1b7ae205e39e95ec65747f8871661aaa105e4 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/usb/gadget/u_ether.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 18a7abae1c6d..4bb79cede55f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 962f3ffa927f2e777a4193843c45ffa6e52ff4b6
+refs/heads/master: 45d1b7ae205e39e95ec65747f8871661aaa105e4
diff --git a/trunk/drivers/usb/gadget/u_ether.c b/trunk/drivers/usb/gadget/u_ether.c
index 1eda968b5644..2ac1d2147325 100644
--- a/trunk/drivers/usb/gadget/u_ether.c
+++ b/trunk/drivers/usb/gadget/u_ether.c
@@ -241,7 +241,7 @@ rx_submit(struct eth_dev *dev, struct usb_request *req, gfp_t gfp_flags)
 	size -= size % out->maxpacket;
 
 	if (dev->port_usb->is_fixed)
-		size = max(size, dev->port_usb->fixed_out_len);
+		size = max_t(size_t, size, dev->port_usb->fixed_out_len);
 
 	skb = alloc_skb(size + NET_IP_ALIGN, gfp_flags);
 	if (skb == NULL) {