The patch titled
baycom_epp.c compile failure
has been added to the -mm tree. Its filename is
re-baycom_eppc-compile-failure.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: baycom_epp.c compile failure
From: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Fix foobar in 15b1c0e822f578306332d4f4c449250db5c5dceb and
e8cc49bb0fdb9e18a99e6780073d1400ba2b0d1f patch series.
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/hamradio/baycom_epp.c | 2 +-
include/net/ax25.h | 2 ++
net/ax25/ax25_addr.c | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff -puN drivers/net/hamradio/baycom_epp.c~re-baycom_eppc-compile-failure drivers/net/hamradio/baycom_epp.c
--- a/drivers/net/hamradio/baycom_epp.c~re-baycom_eppc-compile-failure
+++ a/drivers/net/hamradio/baycom_epp.c
@@ -1177,7 +1177,7 @@ static void baycom_probe(struct net_devi
dev->mtu = AX25_DEF_PACLEN; /* eth_mtu is the default */
dev->addr_len = AX25_ADDR_LEN; /* sizeof an ax.25 address */
memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);
- memcpy(dev->dev_addr, &ax25_nocall, AX25_ADDR_LEN);
+ memcpy(dev->dev_addr, &null_ax25_address, AX25_ADDR_LEN);
dev->tx_queue_len = 16;
/* New style flags */
diff -puN include/net/ax25.h~re-baycom_eppc-compile-failure include/net/ax25.h
--- a/include/net/ax25.h~re-baycom_eppc-compile-failure
+++ a/include/net/ax25.h
@@ -285,6 +285,8 @@ extern struct sock *ax25_make_new(struct
extern const ax25_address ax25_bcast;
extern const ax25_address ax25_defaddr;
extern const ax25_address null_ax25_address;
+extern char *ax2asc(char *buf, const ax25_address *);
+extern void asc2ax(ax25_address *addr, const char *callsign);
extern int ax25cmp(const ax25_address *, const ax25_address *);
extern int ax25digicmp(const ax25_digi *, const ax25_digi *);
extern const unsigned char *ax25_addr_parse(const unsigned char *, int,
diff -puN net/ax25/ax25_addr.c~re-baycom_eppc-compile-failure net/ax25/ax25_addr.c
--- a/net/ax25/ax25_addr.c~re-baycom_eppc-compile-failure
+++ a/net/ax25/ax25_addr.c
@@ -83,7 +83,7 @@ EXPORT_SYMBOL(ax2asc);
*/
void asc2ax(ax25_address *addr, const char *callsign)
{
- char *s;
+ const char *s;
int n;
for (s = callsign, n = 0; n < 6; n++) {
_
Patches currently in -mm which might be from ralf@xxxxxxxxxxxxxx are
origin.patch
sysctl-remove-unused-context-param.patch
dont-build-some-broken-isdn-drivers-on-big-endian-mips.patch
i2o_exec_exit-and-i2o_driver_exit-should-not-be-__exit.patch
fix-namespace-conflict-between-w9968cfc-on-mips.patch
make-lm70_remove-a-__devexit-function.patch
mips-dbg_io-stray-brackets-fix.patch
git-mtd.patch
git-net.patch
re-baycom_eppc-compile-failure.patch
fix-pnx8550-serial-breakage.patch
pnx8550-uart-driver.patch
pci-legacy-resource-fix.patch
pci-legacy-resource-fix-tidy.patch
xfs-remove-useless-wmb-memory-barrier.patch
tty-remove-useless-memory-barrier.patch
getting-rid-of-all-casts-of-kalloc-calls.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
