Index: tools/gformat.py
===================================================================
--- tools/gformat.py	(revision 10075)
+++ tools/gformat.py	(revision 10079)
@@ -334,5 +334,5 @@
   for iface_key in datadump['iface_keys']:
     ifacedump = datadump[iface_key]
-    interface = ifacedump['interface']
+    interface = ifacedump['interface'].split(':')[0]
     # By default no special interface mapping
     iface_map[interface] = interface
@@ -384,5 +384,5 @@
   output += "\n"
   for iface,addrs in sorted(addrs_list.iteritems()):
-    for addr, comment in addrs:
+    for addr, comment in sorted(addrs,key=lambda x: parseaddr(x[0].split('/')[0])):
       ifacedump['iface'] = iface
       output += "# %s || %s || %s\n" % (iface, addr, comment)