Date: Sat, 14 Jan 2012 00:28:03 +0000 (UTC) From: Sean Bruno <sbruno@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r230096 - in user/sbruno/1394dev: firewire fwcontrol Message-ID: <201201140028.q0E0S3Xe086968@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sbruno Date: Sat Jan 14 00:28:02 2012 New Revision: 230096 URL: http://svn.freebsd.org/changeset/base/230096 Log: Integrate to head Modified: user/sbruno/1394dev/firewire/if_fwe.c user/sbruno/1394dev/fwcontrol/fwcontrol.c user/sbruno/1394dev/fwcontrol/fwmpegts.c Directory Properties: user/sbruno/1394dev/firewire/ (props changed) user/sbruno/1394dev/fwcontrol/ (props changed) Modified: user/sbruno/1394dev/firewire/if_fwe.c ============================================================================== --- user/sbruno/1394dev/firewire/if_fwe.c Fri Jan 13 23:32:27 2012 (r230095) +++ user/sbruno/1394dev/firewire/if_fwe.c Sat Jan 14 00:28:02 2012 (r230096) @@ -214,7 +214,6 @@ fwe_attach(device_t dev) #endif ifp->if_start = fwe_start; ifp->if_ioctl = fwe_ioctl; - ifp->if_mtu = ETHERMTU; ifp->if_flags = (IFF_BROADCAST|IFF_SIMPLEX|IFF_MULTICAST); ifp->if_snd.ifq_maxlen = TX_MAX_QUEUE; Modified: user/sbruno/1394dev/fwcontrol/fwcontrol.c ============================================================================== --- user/sbruno/1394dev/fwcontrol/fwcontrol.c Fri Jan 13 23:32:27 2012 (r230095) +++ user/sbruno/1394dev/fwcontrol/fwcontrol.c Sat Jan 14 00:28:02 2012 (r230096) @@ -152,8 +152,7 @@ str2node(int fd, const char *nodestr) fweui2eui64(&data->dev[i].eui, &tmpeui); if (memcmp(&eui, &tmpeui, sizeof(struct eui64)) == 0) { node = data->dev[i].dst; - if (data != NULL) - free(data); + free(data); goto gotnode; } } @@ -1057,7 +1056,7 @@ main(int argc, char **argv) show_topology_map(fd); /* - * Recieve data file from node "-R" + * Receive data file from node "-R" */ #define TAG (1<<6) #define CHANNEL 63 Modified: user/sbruno/1394dev/fwcontrol/fwmpegts.c ============================================================================== --- user/sbruno/1394dev/fwcontrol/fwmpegts.c Fri Jan 13 23:32:27 2012 (r230095) +++ user/sbruno/1394dev/fwcontrol/fwmpegts.c Sat Jan 14 00:28:02 2012 (r230096) @@ -94,7 +94,7 @@ MPEG-2 Transport Stream (MPEG TS) packet N.b. that CRCs are removed by firewire layer! -The following fiels are fixed for IEEE-1394: +The following fields are fixed for IEEE-1394: tag = 01b tcode = 1010b The length is payload length, i.e. includes CIP header and data size.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201140028.q0E0S3Xe086968>