summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-26 01:06:45 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-26 01:06:45 -0400
commit1f57389a38dc1e8be167ec601f39f78f0bed3a96 (patch)
tree5f33d00a046597ae33855cee13d17d77048ba712 /include/net
parent077783f87708b24054452e5c07685ead2c28b1eb (diff)
parent6693e74a16ef563960764bd963f1048392135c3c (diff)
downloadop-kernel-dev-1f57389a38dc1e8be167ec601f39f78f0bed3a96.zip
op-kernel-dev-1f57389a38dc1e8be167ec601f39f78f0bed3a96.tar.gz
Merge branch 'master'
Diffstat (limited to 'include/net')
-rw-r--r--include/net/ax25.h2
-rw-r--r--include/net/llc_pdu.h4
2 files changed, 4 insertions, 2 deletions
diff --git a/include/net/ax25.h b/include/net/ax25.h
index 9dbcd9e..30bb4a8 100644
--- a/include/net/ax25.h
+++ b/include/net/ax25.h
@@ -171,7 +171,7 @@ typedef struct {
ax25_address calls[AX25_MAX_DIGIS];
unsigned char repeated[AX25_MAX_DIGIS];
unsigned char ndigi;
- char lastrepeat;
+ signed char lastrepeat;
} ax25_digi;
typedef struct ax25_route {
diff --git a/include/net/llc_pdu.h b/include/net/llc_pdu.h
index f45c37d..c7a9594 100644
--- a/include/net/llc_pdu.h
+++ b/include/net/llc_pdu.h
@@ -254,8 +254,10 @@ static inline void llc_pdu_decode_sa(struct sk_buff *skb, u8 *sa)
{
if (skb->protocol == ntohs(ETH_P_802_2))
memcpy(sa, eth_hdr(skb)->h_source, ETH_ALEN);
- else if (skb->protocol == ntohs(ETH_P_TR_802_2))
+ else if (skb->protocol == ntohs(ETH_P_TR_802_2)) {
memcpy(sa, tr_hdr(skb)->saddr, ETH_ALEN);
+ *sa &= 0x7F;
+ }
}
/**
OpenPOWER on IntegriCloud