|
@@ -1037,16 +1037,13 @@ static int ax25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
|
|
|
int err = 0;
|
|
|
|
|
|
if (addr_len != sizeof(struct sockaddr_ax25) &&
|
|
|
- addr_len != sizeof(struct full_sockaddr_ax25)) {
|
|
|
- /* support for old structure may go away some time */
|
|
|
+ addr_len != sizeof(struct full_sockaddr_ax25))
|
|
|
+ /* support for old structure may go away some time
|
|
|
+ * ax25_bind(): uses old (6 digipeater) socket structure.
|
|
|
+ */
|
|
|
if ((addr_len < sizeof(struct sockaddr_ax25) + sizeof(ax25_address) * 6) ||
|
|
|
- (addr_len > sizeof(struct full_sockaddr_ax25))) {
|
|
|
+ (addr_len > sizeof(struct full_sockaddr_ax25)))
|
|
|
return -EINVAL;
|
|
|
- }
|
|
|
-
|
|
|
- printk(KERN_WARNING "ax25_bind(): %s uses old (6 digipeater) socket structure.\n",
|
|
|
- current->comm);
|
|
|
- }
|
|
|
|
|
|
if (addr->fsa_ax25.sax25_family != AF_AX25)
|
|
|
return -EINVAL;
|