diff options
Diffstat (limited to 'drivers/net/hamradio')
-rw-r--r-- | drivers/net/hamradio/bpqether.c | 2 | ||||
-rw-r--r-- | drivers/net/hamradio/hdlcdrv.c | 2 | ||||
-rw-r--r-- | drivers/net/hamradio/scc.c | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c index 14f01d156db9..ac1d323c5eb5 100644 --- a/drivers/net/hamradio/bpqether.c +++ b/drivers/net/hamradio/bpqether.c | |||
@@ -168,7 +168,7 @@ static inline struct net_device *bpq_get_ax25_dev(struct net_device *dev) | |||
168 | 168 | ||
169 | static inline int dev_is_ethdev(struct net_device *dev) | 169 | static inline int dev_is_ethdev(struct net_device *dev) |
170 | { | 170 | { |
171 | return (dev->type == ARPHRD_ETHER && strncmp(dev->name, "dummy", 5)); | 171 | return dev->type == ARPHRD_ETHER && strncmp(dev->name, "dummy", 5); |
172 | } | 172 | } |
173 | 173 | ||
174 | /* ------------------------------------------------------------------------ */ | 174 | /* ------------------------------------------------------------------------ */ |
diff --git a/drivers/net/hamradio/hdlcdrv.c b/drivers/net/hamradio/hdlcdrv.c index b8bdf9d51cd4..5b37579e84b7 100644 --- a/drivers/net/hamradio/hdlcdrv.c +++ b/drivers/net/hamradio/hdlcdrv.c | |||
@@ -110,7 +110,7 @@ static int calc_crc_ccitt(const unsigned char *buf, int cnt) | |||
110 | for (; cnt > 0; cnt--) | 110 | for (; cnt > 0; cnt--) |
111 | crc = (crc >> 8) ^ crc_ccitt_table[(crc ^ *buf++) & 0xff]; | 111 | crc = (crc >> 8) ^ crc_ccitt_table[(crc ^ *buf++) & 0xff]; |
112 | crc ^= 0xffff; | 112 | crc ^= 0xffff; |
113 | return (crc & 0xffff); | 113 | return crc & 0xffff; |
114 | } | 114 | } |
115 | #endif | 115 | #endif |
116 | 116 | ||
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c index 9f64c8637208..33655814448e 100644 --- a/drivers/net/hamradio/scc.c +++ b/drivers/net/hamradio/scc.c | |||
@@ -1069,7 +1069,8 @@ static void scc_tx_done(struct scc_channel *scc) | |||
1069 | case KISS_DUPLEX_LINK: | 1069 | case KISS_DUPLEX_LINK: |
1070 | scc->stat.tx_state = TXS_IDLE2; | 1070 | scc->stat.tx_state = TXS_IDLE2; |
1071 | if (scc->kiss.idletime != TIMER_OFF) | 1071 | if (scc->kiss.idletime != TIMER_OFF) |
1072 | scc_start_tx_timer(scc, t_idle, scc->kiss.idletime*100); | 1072 | scc_start_tx_timer(scc, t_idle, |
1073 | scc->kiss.idletime*100); | ||
1073 | break; | 1074 | break; |
1074 | case KISS_DUPLEX_OPTIMA: | 1075 | case KISS_DUPLEX_OPTIMA: |
1075 | scc_notify(scc, HWEV_ALL_SENT); | 1076 | scc_notify(scc, HWEV_ALL_SENT); |