phonet: sparse annotations of protocol, remove forward declaration
net/phonet/af_phonet.c:38:36: error: marked inline, but without a definition net/phonet/pep-gprs.c:63:10: warning: incorrect type in return expression (different base types) net/phonet/pep-gprs.c:63:10: expected int net/phonet/pep-gprs.c:63:10: got restricted __be16 [usertype] <noident> net/phonet/pep-gprs.c:65:10: warning: incorrect type in return expression (different base types) net/phonet/pep-gprs.c:65:10: expected int net/phonet/pep-gprs.c:65:10: got restricted __be16 [usertype] <noident> net/phonet/pep-gprs.c:124:16: warning: incorrect type in assignment (different base types) net/phonet/pep-gprs.c:124:16: expected restricted __be16 [usertype] protocol net/phonet/pep-gprs.c:124:16: got unsigned short [unsigned] [usertype] protocol Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
ca62059b7e
commit
5c7f033358
@@ -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;
|
||||
|
Reference in New Issue
Block a user