From 200fa96ec442d55a07de06e65a048f4021d77299 Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Thu, 6 Nov 2008 23:10:50 -0800
Subject: [PATCH] --- yaml --- r: 121729 b: refs/heads/master c:
 5c7f0333584128c745fbda845abbe3a32c22d467 h: refs/heads/master i:   121727:
 6f314d01812c37851a1854d78f84f147db4030c0 v: v3

---
 [refs]                       |  2 +-
 trunk/net/phonet/af_phonet.c | 11 +++++------
 trunk/net/phonet/pep-gprs.c  |  8 ++++----
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 075861eb917b..4041e8d2be9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca62059b7ec7267d1d2cab0791d3ed6d033e0583
+refs/heads/master: 5c7f0333584128c745fbda845abbe3a32c22d467
diff --git a/trunk/net/phonet/af_phonet.c b/trunk/net/phonet/af_phonet.c
index defeb7a0d502..f400ff168904 100644
--- a/trunk/net/phonet/af_phonet.c
+++ b/trunk/net/phonet/af_phonet.c
@@ -35,7 +35,11 @@
 
 static struct net_proto_family phonet_proto_family;
 static struct phonet_protocol *phonet_proto_get(int protocol);
-static inline void phonet_proto_put(struct phonet_protocol *pp);
+
+static inline void phonet_proto_put(struct phonet_protocol *pp)
+{
+	module_put(pp->prot->owner);
+}
 
 /* protocol family functions */
 
@@ -428,11 +432,6 @@ static struct phonet_protocol *phonet_proto_get(int protocol)
 	return pp;
 }
 
-static inline void phonet_proto_put(struct phonet_protocol *pp)
-{
-	module_put(pp->prot->owner);
-}
-
 /* Module registration */
 static int __init phonet_init(void)
 {
diff --git a/trunk/net/phonet/pep-gprs.c b/trunk/net/phonet/pep-gprs.c
index 9978afbd9f2a..a4324075355f 100644
--- a/trunk/net/phonet/pep-gprs.c
+++ b/trunk/net/phonet/pep-gprs.c
@@ -49,14 +49,14 @@ struct gprs_dev {
 	unsigned		tx_max;
 };
 
-static int gprs_type_trans(struct sk_buff *skb)
+static __be16 gprs_type_trans(struct sk_buff *skb)
 {
 	const u8 *pvfc;
 	u8 buf;
 
 	pvfc = skb_header_pointer(skb, 0, 1, &buf);
 	if (!pvfc)
-		return 0;
+		return htons(0);
 	/* Look at IP version field */
 	switch (*pvfc >> 4) {
 	case 4:
@@ -64,7 +64,7 @@ static int gprs_type_trans(struct sk_buff *skb)
 	case 6:
 		return htons(ETH_P_IPV6);
 	}
-	return 0;
+	return htons(0);
 }
 
 /*
@@ -84,7 +84,7 @@ static void gprs_state_change(struct sock *sk)
 static int gprs_recv(struct gprs_dev *dev, struct sk_buff *skb)
 {
 	int err = 0;
-	u16 protocol = gprs_type_trans(skb);
+	__be16 protocol = gprs_type_trans(skb);
 
 	if (!protocol) {
 		err = -EINVAL;